From 77223d7ced49fffd4b9654d5045c5bba0865ef7c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 20 Nov 2012 14:59:01 -0500
Subject: [PATCH] Deprecate pre 3.1 @MVC support classes

Issue: SPR-10005
---
 .../mvc/annotation/AnnotationMethodHandlerAdapter.java        | 4 ++++
 .../annotation/AnnotationMethodHandlerExceptionResolver.java  | 3 +++
 .../mvc/annotation/DefaultAnnotationHandlerMapping.java       | 3 +++
 .../servlet/mvc/annotation/ServletAnnotationMappingUtils.java | 3 +++
 src/dist/changelog.txt                                        | 3 ++-
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index 8177c562b3..34801814aa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -56,6 +56,7 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.Ordered;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
@@ -138,6 +139,9 @@ import org.springframework.web.util.WebUtils;
  * @see #setMethodNameResolver
  * @see #setWebBindingInitializer
  * @see #setSessionAttributeStore
+ *
+ * @deprecated in Spring 3.2 in favor of
+ * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter RequestMappingHandlerAdapter}
  */
 public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 		implements HandlerAdapter, Ordered, BeanFactoryAware {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index 012b3c85b8..965b905561 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -81,6 +81,9 @@ import org.springframework.web.servlet.support.RequestContextUtils;
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
+ *
+ * @deprecated in Spring 3.2 in favor of
+ * {@link org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver ExceptionHandlerExceptionResolver}
  */
 public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExceptionResolver {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index 19a62b6f87..2e3bfe49f7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -79,6 +79,9 @@ import org.springframework.web.servlet.handler.AbstractDetectingUrlHandlerMappin
  * @since 2.5
  * @see RequestMapping
  * @see AnnotationMethodHandlerAdapter
+ *
+ * @deprecated in Spring 3.2 in favor of
+ * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping RequestMappingHandlerMapping}
  */
 public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandlerMapping {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
index d0cd64225b..c898e413cf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
@@ -31,6 +31,9 @@ import org.springframework.web.util.WebUtils;
  * @author Juergen Hoeller
  * @author Arjen Poutsma
  * @since 2.5.2
+ *
+ * @deprecated in 3.2 together with {@link DefaultAnnotationHandlerMapping},
+ * {@link AnnotationMethodHandlerAdapter}, and {@link AnnotationMethodHandlerExceptionResolver}.
  */
 abstract class ServletAnnotationMappingUtils {
 
diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt
index c66e55e43c..a4c6e0df98 100644
--- a/src/dist/changelog.txt
+++ b/src/dist/changelog.txt
@@ -74,7 +74,8 @@ Changes in version 3.2 RC1 (2012-11-04)
 * use concurrent cache to improve performance of GenericTypeResolver (SPR-8701)
 * cache and late resolve annotations on bean properties to improve performance (SPR-9166)
 * allow PropertyResolver implementations to ignore unresolvable ${placeholders} (SPR-9569)
-* add integration with Tiles 3
+* add integration with Tiles 3 (SPR-8825)
+* deprecated DefaultAnnotationHandlerMapping, AnnotationMethodHandlerAdapter, and AnnotationMethodHandlerExceptionResolver (SPR-10005)
 
 Changes in version 3.2 M2 (2012-09-11)
 --------------------------------------