Change classes to use PortMapperImpl and PortResolverImpl by default.

core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java

@@ -19,6 +19,7 @@ import net.sf.acegisecurity.AccessDeniedException;
 import net.sf.acegisecurity.AuthenticationException;
 import net.sf.acegisecurity.ui.AbstractProcessingFilter;
 import net.sf.acegisecurity.util.PortResolver;
+import net.sf.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -100,7 +101,7 @@ public class SecurityEnforcementFilter implements Filter, InitializingBean {
 
     private AuthenticationEntryPoint authenticationEntryPoint;
     private FilterSecurityInterceptor filterSecurityInterceptor;
-    private PortResolver portResolver;
+    private PortResolver portResolver = new PortResolverImpl();
 
     //~ Methods ================================================================
 

core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java

@@ -16,7 +16,9 @@
 package net.sf.acegisecurity.securechannel;
 
 import net.sf.acegisecurity.util.PortMapper;
+import net.sf.acegisecurity.util.PortMapperImpl;
 import net.sf.acegisecurity.util.PortResolver;
+import net.sf.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -52,8 +54,8 @@ public class RetryWithHttpEntryPoint implements InitializingBean,
 
     //~ Instance fields ========================================================
 
-    private PortMapper portMapper;
-    private PortResolver portResolver;
+    private PortMapper portMapper = new PortMapperImpl();
+    private PortResolver portResolver = new PortResolverImpl();
 
     //~ Methods ================================================================
 

core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java

@@ -16,7 +16,9 @@
 package net.sf.acegisecurity.securechannel;
 
 import net.sf.acegisecurity.util.PortMapper;
+import net.sf.acegisecurity.util.PortMapperImpl;
 import net.sf.acegisecurity.util.PortResolver;
+import net.sf.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -52,8 +54,8 @@ public class RetryWithHttpsEntryPoint implements InitializingBean,
 
     //~ Instance fields ========================================================
 
-    private PortMapper portMapper;
-    private PortResolver portResolver;
+    private PortMapper portMapper = new PortMapperImpl();
+    private PortResolver portResolver = new PortResolverImpl();
 
     //~ Methods ================================================================
 

core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java

@@ -17,7 +17,9 @@ package net.sf.acegisecurity.ui.webapp;
 
 import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
 import net.sf.acegisecurity.util.PortMapper;
+import net.sf.acegisecurity.util.PortMapperImpl;
 import net.sf.acegisecurity.util.PortResolver;
+import net.sf.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -63,8 +65,8 @@ public class AuthenticationProcessingFilterEntryPoint
 
     //~ Instance fields ========================================================
 
-    private PortMapper portMapper;
-    private PortResolver portResolver;
+    private PortMapper portMapper = new PortMapperImpl();
+    private PortResolver portResolver = new PortResolverImpl();
     private String loginFormUrl;
     private boolean forceHttps = false;
 

core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java

@@ -233,6 +233,7 @@ public class SecurityEnforcementFilterTests extends TestCase {
                 false, false));
         filter.setAuthenticationEntryPoint(new MockAuthenticationEntryPoint(
                 "/login.jsp"));
+        filter.setPortResolver(null);
 
         try {
             filter.afterPropertiesSet();

core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java

@@ -45,7 +45,7 @@ public class RetryWithHttpEntryPointTests extends TestCase {
 
     public void testDetectsMissingPortMapper() throws Exception {
         RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        ep.setPortResolver(new MockPortResolver(80, 443));
+        ep.setPortMapper(null);
 
         try {
             ep.afterPropertiesSet();
@@ -57,7 +57,7 @@ public class RetryWithHttpEntryPointTests extends TestCase {
 
     public void testDetectsMissingPortResolver() throws Exception {
         RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
+        ep.setPortResolver(null);
 
         try {
             ep.afterPropertiesSet();

core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java

@@ -45,7 +45,7 @@ public class RetryWithHttpsEntryPointTests extends TestCase {
 
     public void testDetectsMissingPortMapper() throws Exception {
         RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortResolver(new MockPortResolver(80, 443));
+        ep.setPortMapper(null);
 
         try {
             ep.afterPropertiesSet();
@@ -57,7 +57,7 @@ public class RetryWithHttpsEntryPointTests extends TestCase {
 
     public void testDetectsMissingPortResolver() throws Exception {
         RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
+        ep.setPortResolver(null);
 
         try {
             ep.afterPropertiesSet();

core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java

@@ -60,7 +60,7 @@ public class AuthenticationProcessingFilterEntryPointTests extends TestCase {
     public void testDetectsMissingPortMapper() throws Exception {
         AuthenticationProcessingFilterEntryPoint ep = new AuthenticationProcessingFilterEntryPoint();
         ep.setLoginFormUrl("xxx");
-        ep.setPortResolver(new MockPortResolver(80, 443));
+        ep.setPortMapper(null);
 
         try {
             ep.afterPropertiesSet();
@@ -73,7 +73,7 @@ public class AuthenticationProcessingFilterEntryPointTests extends TestCase {
     public void testDetectsMissingPortResolver() throws Exception {
         AuthenticationProcessingFilterEntryPoint ep = new AuthenticationProcessingFilterEntryPoint();
         ep.setLoginFormUrl("xxx");
-        ep.setPortMapper(new PortMapperImpl());
+        ep.setPortResolver(null);
 
         try {
             ep.afterPropertiesSet();