diff --git a/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java index 19a6fd377f..12ca38fd1d 100644 --- a/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java +++ b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java @@ -29,9 +29,9 @@ import org.springframework.security.authentication.AuthenticationTrustResolverIm import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.util.ThrowableAnalyzer; -import org.springframework.security.util.ThrowableCauseExtractor; import org.springframework.security.web.savedrequest.SavedRequest; +import org.springframework.security.web.util.ThrowableAnalyzer; +import org.springframework.security.web.util.ThrowableCauseExtractor; import org.springframework.util.Assert; /** @@ -252,7 +252,7 @@ public class ExceptionTranslationFilter extends SpringSecurityFilter implements */ private static final class DefaultThrowableAnalyzer extends ThrowableAnalyzer { /** - * @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() + * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap() */ protected void initExtractorMap() { super.initExtractorMap(); diff --git a/core/src/main/java/org/springframework/security/util/ThrowableAnalyzer.java b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java similarity index 99% rename from core/src/main/java/org/springframework/security/util/ThrowableAnalyzer.java rename to web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java index 5ea0f63680..0781dc55f1 100755 --- a/core/src/main/java/org/springframework/security/util/ThrowableAnalyzer.java +++ b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java @@ -1,4 +1,4 @@ -package org.springframework.security.util; +package org.springframework.security.web.util; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/core/src/main/java/org/springframework/security/util/ThrowableCauseExtractor.java b/web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java similarity index 93% rename from core/src/main/java/org/springframework/security/util/ThrowableCauseExtractor.java rename to web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java index 3ac13ecb7f..8e68ed8d65 100755 --- a/core/src/main/java/org/springframework/security/util/ThrowableCauseExtractor.java +++ b/web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java @@ -1,4 +1,4 @@ -package org.springframework.security.util; +package org.springframework.security.web.util; /** diff --git a/core/src/test/java/org/springframework/security/util/ThrowableAnalyzerTests.java b/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java similarity index 95% rename from core/src/test/java/org/springframework/security/util/ThrowableAnalyzerTests.java rename to web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java index 747f7a78f0..d632314666 100644 --- a/core/src/test/java/org/springframework/security/util/ThrowableAnalyzerTests.java +++ b/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java @@ -1,7 +1,10 @@ -package org.springframework.security.util; +package org.springframework.security.web.util; import java.lang.reflect.InvocationTargetException; +import org.springframework.security.web.util.ThrowableAnalyzer; +import org.springframework.security.web.util.ThrowableCauseExtractor; + import junit.framework.TestCase; /** @@ -82,7 +85,7 @@ public class ThrowableAnalyzerTests extends TestCase { // Set up nonstandard analyzer this.nonstandardAnalyzer = new ThrowableAnalyzer() { /** - * @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() + * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap() */ @Override protected void initExtractorMap() { @@ -107,7 +110,7 @@ public class ThrowableAnalyzerTests extends TestCase { new ThrowableAnalyzer() { /** - * @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() + * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap() */ @Override protected void initExtractorMap() { @@ -143,7 +146,7 @@ public class ThrowableAnalyzerTests extends TestCase { ThrowableAnalyzer analyzer = new ThrowableAnalyzer() { /** - * @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() + * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap() */ @Override protected void initExtractorMap() {