From 23b2eaa65d2ca86ed9a6582be8c9fe9439cb0dce Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Tue, 5 May 2009 13:41:03 +0000 Subject: [PATCH] Moved DefaultHandlerExceptionResolver to fix a tangle. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1098 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../springframework/web/servlet/DispatcherServlet.properties | 2 +- .../support}/DefaultHandlerExceptionResolver.java | 3 ++- .../support}/DefaultHandlerExceptionResolverTests.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/{handler => mvc/support}/DefaultHandlerExceptionResolver.java (98%) rename org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/{handler => mvc/support}/DefaultHandlerExceptionResolverTests.java (98%) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties index c3c46327538..933d4ed55bd 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties @@ -15,7 +15,7 @@ org.springframework.web.servlet.HandlerAdapter=org.springframework.web.servlet.m org.springframework.web.servlet.HandlerExceptionResolver=org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerExceptionResolver,\ org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver,\ - org.springframework.web.servlet.handler.DefaultHandlerExceptionResolver + org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver org.springframework.web.servlet.RequestToViewNameTranslator=org.springframework.web.servlet.view.DefaultRequestToViewNameTranslator diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DefaultHandlerExceptionResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DefaultHandlerExceptionResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java index dccdabb514a..362294b75d5 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/DefaultHandlerExceptionResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.handler; +package org.springframework.web.servlet.mvc.support; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -33,6 +33,7 @@ import org.springframework.web.HttpMediaTypeNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver; import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; /** diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/DefaultHandlerExceptionResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java similarity index 98% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/DefaultHandlerExceptionResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java index 365744234ba..b49b3499899 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/DefaultHandlerExceptionResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.handler; +package org.springframework.web.servlet.mvc.support; import java.util.Collections;