From b61c05ff897eb9442b5432223d51a940fab8cb53 Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Wed, 28 Apr 2004 00:10:56 +0000 Subject: [PATCH] Change classes to use PortMapperImpl and PortResolverImpl by default. --- .../intercept/web/SecurityEnforcementFilter.java | 3 ++- .../securechannel/RetryWithHttpEntryPoint.java | 6 ++++-- .../securechannel/RetryWithHttpsEntryPoint.java | 6 ++++-- .../ui/webapp/AuthenticationProcessingFilterEntryPoint.java | 6 ++++-- .../intercept/web/SecurityEnforcementFilterTests.java | 1 + .../securechannel/RetryWithHttpEntryPointTests.java | 4 ++-- .../securechannel/RetryWithHttpsEntryPointTests.java | 4 ++-- .../AuthenticationProcessingFilterEntryPointTests.java | 4 ++-- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java b/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java index 7a6005331e..8a2c46eb09 100644 --- a/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java +++ b/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 ================================================================ diff --git a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java b/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java index 133aec7b09..0d31800bf9 100644 --- a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java +++ b/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 ================================================================ diff --git a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java b/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java index f2ff31af28..dff19c8db9 100644 --- a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java +++ b/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 ================================================================ diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java b/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java index 14dfb791c8..9ab40f45be 100644 --- a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java +++ b/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; diff --git a/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java b/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java index 72706f305c..011a0b3838 100644 --- a/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java +++ b/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(); diff --git a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java b/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java index b0bf002fe9..13754790f0 100644 --- a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java +++ b/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(); diff --git a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java b/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java index 85048908a7..c37adcedb2 100644 --- a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java +++ b/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(); diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java b/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java index b7ed9b5f6e..58eb8cbe59 100644 --- a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java +++ b/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();