From 8f7b216de3d08e6a1ce3060946321757e0876d23 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Mon, 17 Mar 2008 14:10:22 +0000
Subject: [PATCH] Import cleaning, removal of unnecessary constructors etc
 based on eclipse warnings

---
 .../security/acls/jdbc/JdbcAclServiceTests.java        |  1 -
 .../security/adapters/jboss/MockInitialContext.java    |  6 +-----
 .../adapters/jboss/MockJbossIntegrationFilter.java     |  6 +-----
 .../captcha/CaptchaChannelProcessorTemplateTests.java  |  1 -
 .../security/annotation/BusinessService.java           |  1 -
 .../security/annotation/Jsr250BusinessServiceImpl.java |  1 -
 .../MethodDefinitionSourceEditorTigerTests.java        |  5 -----
 .../security/ConfigAttributeEditor.java                | 10 ++++------
 .../security/intercept/ObjectDefinitionSource.java     |  1 -
 .../intercept/method/MethodDefinitionSourceEditor.java |  2 --
 .../springframework/security/vote/UnanimousBased.java  |  1 -
 .../security/MockAuthenticationEntryPoint.java         |  4 ----
 .../org/springframework/security/MockJoinPoint.java    |  6 ------
 .../springframework/security/SecurityConfigTests.java  |  4 ----
 .../AfterInvocationProviderManagerTests.java           | 10 ----------
 .../concurrent/ConcurrentSessionFilterTests.java       |  4 ----
 .../security/concurrent/SessionRegistryImplTests.java  |  4 ----
 .../config/LdapProviderBeanDefinitionParserTests.java  |  1 -
 .../method/MethodDefinitionSourceEditorTests.java      |  3 +--
 .../DefaultFilterInvocationDefinitionSourceTests.java  |  2 --
 .../FilterInvocationDefinitionSourceEditorTests.java   |  1 -
 .../security/ldap/AbstractLdapIntegrationTests.java    |  2 --
 .../providers/AbstractAuthenticationTokenTests.java    |  4 ----
 .../anonymous/AnonymousProcessingFilterTests.java      |  8 --------
 .../securechannel/ChannelProcessingFilterTests.java    |  8 --------
 .../ui/rememberme/RememberMeProcessingFilterTests.java |  4 ----
 .../security/util/FilterToBeanProxyTests.java          |  4 ----
 .../security/vote/AffirmativeBasedTests.java           |  1 -
 .../security/vote/BasicAclEntryVoterTests.java         |  8 --------
 .../security/vote/ConsensusBasedTests.java             |  1 -
 .../security/vote/SomeDomainObject.java                |  2 --
 .../security/vote/UnanimousBasedTests.java             |  1 -
 samples/contacts/src/main/webapp/error.html            |  2 +-
 .../security/taglibs/authz/AclTagTests.java            |  1 -
 34 files changed, 8 insertions(+), 112 deletions(-)

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 29d630f487..666d73e1e1 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
@@ -25,7 +25,6 @@ import org.springframework.security.acls.ChildrenExistException;
 import org.springframework.security.acls.MutableAcl;
 import org.springframework.security.acls.NotFoundException;
 import org.springframework.security.acls.Permission;
-import org.springframework.security.acls.domain.AclImpl;
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.objectidentity.ObjectIdentity;
 import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
diff --git a/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java
index 64fa674be6..2a7234847d 100644
--- a/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java
+++ b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java
@@ -29,7 +29,7 @@ import javax.naming.NamingException;
  * <code>java:comp/env/security/subject</code>.
  *
  * @author Ben Alex
- * @version $Id$
+ * @version $Id:MockInitialContext.java 2151 2007-09-22 11:54:13Z luke_t $
  */
 public class MockInitialContext implements Context {
     //~ Instance fields ================================================================================================
@@ -42,10 +42,6 @@ public class MockInitialContext implements Context {
         this.object = object;
     }
 
-    private MockInitialContext() {
-        super();
-    }
-
     //~ Methods ========================================================================================================
 
     public Object addToEnvironment(String propName, Object propVal)
diff --git a/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java
index 957b687d94..f2c19eb0c4 100644
--- a/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java
+++ b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java
@@ -24,7 +24,7 @@ import javax.naming.NamingException;
  * constructor.
  *
  * @author Ben Alex
- * @version $Id$
+ * @version $Id:MockJbossIntegrationFilter.java 2151 2007-09-22 11:54:13Z luke_t $
  */
 public class MockJbossIntegrationFilter extends JbossIntegrationFilter {
     //~ Instance fields ================================================================================================
@@ -37,10 +37,6 @@ public class MockJbossIntegrationFilter extends JbossIntegrationFilter {
         this.context = context;
     }
 
-    private MockJbossIntegrationFilter() {
-        super();
-    }
-
     //~ Methods ========================================================================================================
 
     protected Context getLookupContext() throws NamingException {
diff --git a/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java b/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
index 2ea6e3833f..09e4ad4994 100644
--- a/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
+++ b/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
@@ -18,7 +18,6 @@ package org.springframework.security.captcha;
 import junit.framework.TestCase;
 
 import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.MockFilterChain;
 import org.springframework.security.SecurityConfig;
 
 import org.springframework.security.context.SecurityContextHolder;
diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java b/core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java
index 657a03dfc1..110f130067 100644
--- a/core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java
+++ b/core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java
@@ -16,7 +16,6 @@
 package org.springframework.security.annotation;
 
 import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.DenyAll;
 import javax.annotation.security.PermitAll;
 
 /**
diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java b/core-tiger/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java
index 2344146956..59f0c9ff7b 100644
--- a/core-tiger/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java
+++ b/core-tiger/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java
@@ -1,7 +1,6 @@
 package org.springframework.security.annotation;
 
 import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.DenyAll;
 import javax.annotation.security.PermitAll;
 
 /**
diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java b/core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java
index 4640a8587f..21670f06ca 100644
--- a/core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java
+++ b/core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Method;
 import junit.framework.TestCase;
 
 import org.springframework.security.ConfigAttributeDefinition;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.annotation.test.Entity;
 import org.springframework.security.annotation.test.OrganisationService;
 import org.springframework.security.annotation.test.PersonService;
@@ -90,10 +89,6 @@ public class MethodDefinitionSourceEditorTigerTests extends TestCase {
     private class MockMethodInvocation implements MethodInvocation {
         Method method;
 
-        private MockMethodInvocation() {
-            super();
-        }
-
         public MockMethodInvocation(Class clazz, String methodName, Class[] parameterTypes)
             throws NoSuchMethodException {
             System.out.println(clazz + " " + methodName + " " + parameterTypes[0]);
diff --git a/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java b/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java
index 9435babd87..1958002188 100644
--- a/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java
+++ b/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java
@@ -18,14 +18,13 @@ package org.springframework.security;
 import org.springframework.util.StringUtils;
 
 import java.beans.PropertyEditorSupport;
-import java.util.List;
-import java.util.ArrayList;
-
 
 /**
  * A property editor that can create a populated  {@link ConfigAttributeDefinition} from a comma separated list of
- * values.<P>Trims preceding and trailing spaces from presented command separated tokens, as this can be a source
- * of hard-to-spot configuration issues for end users.</p>
+ * values.
+ * <p>
+ * Trims preceding and trailing spaces from presented command separated tokens, as this can be a source
+ * of hard-to-spot configuration issues for end users.
  *
  * @author Ben Alex
  * @version $Id$
@@ -38,7 +37,6 @@ public class ConfigAttributeEditor extends PropertyEditorSupport {
             setValue(new ConfigAttributeDefinition(StringUtils.commaDelimitedListToStringArray(s)));
         } else {
             setValue(null);
-
         }
     }
 }
diff --git a/core/src/main/java/org/springframework/security/intercept/ObjectDefinitionSource.java b/core/src/main/java/org/springframework/security/intercept/ObjectDefinitionSource.java
index 69da2c365c..fae4f9b7be 100644
--- a/core/src/main/java/org/springframework/security/intercept/ObjectDefinitionSource.java
+++ b/core/src/main/java/org/springframework/security/intercept/ObjectDefinitionSource.java
@@ -17,7 +17,6 @@ package org.springframework.security.intercept;
 
 import org.springframework.security.ConfigAttributeDefinition;
 
-import java.util.Iterator;
 import java.util.Collection;
 
 
diff --git a/core/src/main/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditor.java b/core/src/main/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditor.java
index 359b6c4acb..2c52a357bd 100644
--- a/core/src/main/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditor.java
+++ b/core/src/main/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditor.java
@@ -25,9 +25,7 @@ import org.springframework.util.StringUtils;
 
 import java.beans.PropertyEditorSupport;
 
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Properties;
 import java.util.Map;
 import java.util.LinkedHashMap;
diff --git a/core/src/main/java/org/springframework/security/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/vote/UnanimousBased.java
index a051345a41..c8763dd76c 100644
--- a/core/src/main/java/org/springframework/security/vote/UnanimousBased.java
+++ b/core/src/main/java/org/springframework/security/vote/UnanimousBased.java
@@ -21,7 +21,6 @@ import org.springframework.security.ConfigAttribute;
 import org.springframework.security.ConfigAttributeDefinition;
 
 import java.util.Iterator;
-import java.util.Arrays;
 
 
 /**
diff --git a/core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java b/core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java
index 965d864ff1..6f7c6d4c11 100644
--- a/core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java
+++ b/core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java
@@ -43,10 +43,6 @@ public class MockAuthenticationEntryPoint implements AuthenticationEntryPoint {
         this.url = url;
     }
 
-    private MockAuthenticationEntryPoint() {
-        super();
-    }
-
     //~ Methods ========================================================================================================
 
     public void commence(ServletRequest request, ServletResponse response,
diff --git a/core/src/test/java/org/springframework/security/MockJoinPoint.java b/core/src/test/java/org/springframework/security/MockJoinPoint.java
index e402bbbb80..e21cad6263 100644
--- a/core/src/test/java/org/springframework/security/MockJoinPoint.java
+++ b/core/src/test/java/org/springframework/security/MockJoinPoint.java
@@ -42,8 +42,6 @@ public class MockJoinPoint implements JoinPoint {
         this.beingInvoked = beingInvoked;
     }
 
-    private MockJoinPoint() {}
-
     //~ Methods ========================================================================================================
 
     public Object[] getArgs() {
@@ -91,8 +89,6 @@ public class MockJoinPoint implements JoinPoint {
             this.beingInvoked = beingInvoked;
         }
 
-        private MockCodeSignature() {}
-
         public Class getDeclaringType() {
             throw new UnsupportedOperationException("mock not implemented");
         }
@@ -137,8 +133,6 @@ public class MockJoinPoint implements JoinPoint {
             this.beingInvoked = beingInvoked;
         }
 
-        private MockStaticPart() {}
-
         public String getKind() {
             throw new UnsupportedOperationException("mock not implemented");
         }
diff --git a/core/src/test/java/org/springframework/security/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/SecurityConfigTests.java
index 6d636421d7..0127a1f028 100644
--- a/core/src/test/java/org/springframework/security/SecurityConfigTests.java
+++ b/core/src/test/java/org/springframework/security/SecurityConfigTests.java
@@ -100,10 +100,6 @@ public class SecurityConfigTests extends TestCase {
             this.attribute = configuration;
         }
 
-        private MockConfigAttribute() {
-            super();
-        }
-
         public String getAttribute() {
             return this.attribute;
         }
diff --git a/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
index 5a024d3202..293ba010ac 100644
--- a/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
@@ -52,14 +52,6 @@ public class AfterInvocationProviderManagerTests extends TestCase {
 
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AfterInvocationProviderManagerTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
     public void testCorrectOperation() throws Exception {
         AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
         List list = new Vector();
@@ -170,8 +162,6 @@ public class AfterInvocationProviderManagerTests extends TestCase {
             this.configAttribute = configAttribute;
         }
 
-        private MockAfterInvocationProvider() {}
-
         public Object decide(Authentication authentication, Object object, ConfigAttributeDefinition config,
             Object returnedObject) throws AccessDeniedException {
             if (config.contains(configAttribute)) {
diff --git a/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java b/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java
index 39e9d7555d..22bf4d9516 100644
--- a/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java
@@ -153,10 +153,6 @@ public class ConcurrentSessionFilterTests extends TestCase {
             this.expectToProceed = expectToProceed;
         }
 
-        private MockFilterChain() {
-            super();
-        }
-
         public void doFilter(ServletRequest request, ServletResponse response)
             throws IOException, ServletException {
             if (expectToProceed) {
diff --git a/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java
index c0a6d191e4..e8c48d157d 100644
--- a/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java
@@ -22,10 +22,6 @@ import org.springframework.security.ui.session.HttpSessionDestroyedEvent;
 import org.springframework.mock.web.MockHttpSession;
 
 import java.util.Date;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Arrays;
-
 
 /**
  * Tests {@link SessionRegistryImpl}.
diff --git a/core/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java b/core/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java
index effe1e53bb..ad8a143be1 100644
--- a/core/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java
+++ b/core/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java
@@ -1,6 +1,5 @@
 package org.springframework.security.config;
 
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.security.providers.ProviderManager;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.providers.ldap.LdapAuthenticationProvider;
diff --git a/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java b/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
index 39521ec375..ca81a788ec 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.MockJoinPoint;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.TargetObject;
 
 import org.aopalliance.intercept.MethodInvocation;
@@ -31,7 +30,7 @@ import java.util.Iterator;
 
 
 /**
- * Tests {@link MethodDefinitionSourceEditor} and its asociated {@link MethodDefinitionMap}.
+ * Tests {@link MethodDefinitionSourceEditor} and its associated {@link MethodDefinitionMap}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationDefinitionSourceTests.java
index 4fa1566377..f78304a836 100644
--- a/core/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationDefinitionSourceTests.java
@@ -17,7 +17,6 @@ package org.springframework.security.intercept.web;
 
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.MockFilterChain;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.util.AntUrlPathMatcher;
 import org.springframework.security.util.InMemoryXmlApplicationContext;
 
@@ -27,7 +26,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
 
 /**
  * Tests parts of {@link DefaultFilterInvocationDefinitionSource} not tested by {@link
diff --git a/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
index 13f50bbe93..0dcdd6bfb0 100644
--- a/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.MockFilterChain;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.util.RegexUrlPathMatcher;
 import org.springframework.security.util.AntUrlPathMatcher;
 
diff --git a/core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java b/core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
index 937739033d..131ac9d8d0 100644
--- a/core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
+++ b/core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
@@ -15,7 +15,6 @@
 package org.springframework.security.ldap;
 
 import org.springframework.security.config.BeanIds;
-import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -33,7 +32,6 @@ import javax.naming.NamingEnumeration;
 import javax.naming.Binding;
 import javax.naming.ContextNotEmptyException;
 import javax.naming.NameNotFoundException;
-import java.util.Set;
 
 /**
  * Based on class borrowed from Spring Ldap project.
diff --git a/core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java
index b5609dfdc4..a4a5d7c43f 100644
--- a/core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java
@@ -146,10 +146,6 @@ public class AbstractAuthenticationTokenTests extends TestCase {
             this.credentials = credentials;
         }
 
-        private MockAuthenticationImpl() {
-            super(null);
-        }
-
         public Object getCredentials() {
             return this.credentials;
         }
diff --git a/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java
index 9e55031071..d50802c924 100644
--- a/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java
@@ -68,10 +68,6 @@ public class AnonymousProcessingFilterTests extends TestCase {
         filter.destroy();
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AnonymousProcessingFilterTests.class);
-    }
-
     protected void setUp() throws Exception {
         super.setUp();
         SecurityContextHolder.clearContext();
@@ -192,10 +188,6 @@ public class AnonymousProcessingFilterTests extends TestCase {
             this.expectToProceed = expectToProceed;
         }
 
-        private MockFilterChain() {
-            super();
-        }
-
         public void doFilter(ServletRequest request, ServletResponse response)
             throws IOException, ServletException {
             if (expectToProceed) {
diff --git a/core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java b/core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
index 8b8472459a..f9ed4a7ee1 100644
--- a/core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
@@ -219,10 +219,6 @@ public class ChannelProcessingFilterTests extends TestCase {
             this.supportAttribute = supportAttribute;
         }
 
-        private MockChannelDecisionManager() {
-            super();
-        }
-
         public void decide(FilterInvocation invocation, ConfigAttributeDefinition config)
             throws IOException, ServletException {
             if (commitAResponse) {
@@ -272,10 +268,6 @@ public class ChannelProcessingFilterTests extends TestCase {
             this.provideIterator = provideIterator;
         }
 
-        private MockFilterInvocationDefinitionMap() {
-            super();
-        }
-
         public ConfigAttributeDefinition getAttributes(Object object)
             throws IllegalArgumentException {
             FilterInvocation fi = (FilterInvocation) object;
diff --git a/core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java
index 24eb94f86f..ccba0c3a69 100644
--- a/core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java
@@ -190,10 +190,6 @@ public class RememberMeProcessingFilterTests extends TestCase {
             this.expectToProceed = expectToProceed;
         }
 
-        private MockFilterChain() {
-            super();
-        }
-
         public void doFilter(ServletRequest request, ServletResponse response)
             throws IOException, ServletException {
             if (expectToProceed) {
diff --git a/core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java b/core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java
index 42aaac4a08..71182b37d6 100644
--- a/core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java
+++ b/core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java
@@ -242,10 +242,6 @@ public class FilterToBeanProxyTests extends TestCase {
             this.appContextLocation = appContextLocation;
         }
 
-        private MockFilterToBeanProxy() {
-            super();
-        }
-
         protected ApplicationContext getContext(FilterConfig filterConfig) {
             return new ClassPathXmlApplicationContext(appContextLocation);
         }
diff --git a/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
index b17cbb705d..ee0395d093 100644
--- a/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
+++ b/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
@@ -21,7 +21,6 @@ import org.springframework.security.AccessDeniedException;
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.SecurityConfig;
 
 import org.springframework.security.providers.TestingAuthenticationToken;
 
diff --git a/core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java b/core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java
index ff7763cfe1..f726025de6 100644
--- a/core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java
+++ b/core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java
@@ -110,14 +110,6 @@ public class BasicAclEntryVoterTests extends TestCase {
     }
 
     public void testStartupRejectsMissingAclManager() throws Exception {
-        AclManager aclManager = new MockAclManager("domain1", "rod",
-                new AclEntry[] {
-                    new MockAclEntry(),
-                    new SimpleAclEntry("rod", new MockAclObjectIdentity(), null, SimpleAclEntry.ADMINISTRATION),
-                    new SimpleAclEntry("rod", new MockAclObjectIdentity(), null, SimpleAclEntry.READ),
-                    new SimpleAclEntry("rod", new MockAclObjectIdentity(), null, SimpleAclEntry.DELETE)
-                });
-
         // Wire up a voter
         BasicAclEntryVoter voter = new BasicAclEntryVoter();
         voter.setProcessConfigAttribute("FOO_ADMIN_OR_WRITE_ACCESS");
diff --git a/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
index 04b9ee57c1..53f1aec72d 100644
--- a/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
+++ b/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
@@ -24,7 +24,6 @@ import org.springframework.security.AccessDeniedException;
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.providers.TestingAuthenticationToken;
 
 
diff --git a/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java b/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
index e86ac9d51f..14d01c3e5d 100644
--- a/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
+++ b/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
@@ -32,8 +32,6 @@ public class SomeDomainObject {
         this.identity = identity;
     }
 
-    private SomeDomainObject() {}
-
     //~ Methods ========================================================================================================
 
     public String getParent() {
diff --git a/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
index b14228babe..51ec11e0c1 100644
--- a/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
+++ b/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
@@ -21,7 +21,6 @@ import org.springframework.security.AccessDeniedException;
 import org.springframework.security.ConfigAttributeDefinition;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.SecurityConfig;
 
 import org.springframework.security.providers.TestingAuthenticationToken;
 
diff --git a/samples/contacts/src/main/webapp/error.html b/samples/contacts/src/main/webapp/error.html
index 5d461b5a25..3c58108da5 100644
--- a/samples/contacts/src/main/webapp/error.html
+++ b/samples/contacts/src/main/webapp/error.html
@@ -1,5 +1,5 @@
 <html>
 	<title>Access denied!</title>
 	<h1>Access Denied</h1>
-	We're sorry, but you are not authorized to perform the requested operation.
+	<p>We're sorry, but you are not authorized to perform the requested operation.</p>
 </html>
\ No newline at end of file
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java
index 083bb505c0..44228c1037 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
 
 import org.springframework.security.acl.AclEntry;
 import org.springframework.security.acl.AclManager;