SEC-1132: Moved ThrowableAnalyzer code to web module as it is only used in ExceptionTranslationFilter

This commit is contained in:
Luke Taylor 2009-04-25 07:03:15 +00:00
parent 1ac0ea9d3f
commit a76cbee4bc
4 changed files with 12 additions and 9 deletions

View File

@ -29,9 +29,9 @@ import org.springframework.security.authentication.AuthenticationTrustResolverIm
import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.authentication.InsufficientAuthenticationException;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.context.SecurityContextHolder; 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.savedrequest.SavedRequest;
import org.springframework.security.web.util.ThrowableAnalyzer;
import org.springframework.security.web.util.ThrowableCauseExtractor;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
@ -252,7 +252,7 @@ public class ExceptionTranslationFilter extends SpringSecurityFilter implements
*/ */
private static final class DefaultThrowableAnalyzer extends ThrowableAnalyzer { 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() { protected void initExtractorMap() {
super.initExtractorMap(); super.initExtractorMap();

View File

@ -1,4 +1,4 @@
package org.springframework.security.util; package org.springframework.security.web.util;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package org.springframework.security.util; package org.springframework.security.web.util;
/** /**

View File

@ -1,7 +1,10 @@
package org.springframework.security.util; package org.springframework.security.web.util;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import org.springframework.security.web.util.ThrowableAnalyzer;
import org.springframework.security.web.util.ThrowableCauseExtractor;
import junit.framework.TestCase; import junit.framework.TestCase;
/** /**
@ -82,7 +85,7 @@ public class ThrowableAnalyzerTests extends TestCase {
// Set up nonstandard analyzer // Set up nonstandard analyzer
this.nonstandardAnalyzer = new ThrowableAnalyzer() { this.nonstandardAnalyzer = new ThrowableAnalyzer() {
/** /**
* @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
*/ */
@Override @Override
protected void initExtractorMap() { protected void initExtractorMap() {
@ -107,7 +110,7 @@ public class ThrowableAnalyzerTests extends TestCase {
new ThrowableAnalyzer() { new ThrowableAnalyzer() {
/** /**
* @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
*/ */
@Override @Override
protected void initExtractorMap() { protected void initExtractorMap() {
@ -143,7 +146,7 @@ public class ThrowableAnalyzerTests extends TestCase {
ThrowableAnalyzer analyzer = new ThrowableAnalyzer() { ThrowableAnalyzer analyzer = new ThrowableAnalyzer() {
/** /**
* @see org.springframework.security.util.ThrowableAnalyzer#initExtractorMap() * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
*/ */
@Override @Override
protected void initExtractorMap() { protected void initExtractorMap() {