From 44fcc572a7848e6a0cf1089a9183a7a89285fcbe Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sat, 21 Nov 2009 15:17:26 +0000
Subject: [PATCH] mvc:interceptors namespace element initial commit

---
 .../web/servlet/config/spring-mvc-3.0.xsd     | 26 ++++++++++++++-----
 .../web/servlet/config/MvcNamespaceTests.java | 13 ++++++++++
 .../config/mvc-config-interceptors.xml        | 15 +++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml

diff --git a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd b/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
index 1f3d610008f..0a8463725e7 100644
--- a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
+++ b/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
@@ -5,10 +5,8 @@
 	targetNamespace="http://www.springframework.org/schema/mvc"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"
-		schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool"
-		schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
 
 	<xsd:element name="annotation-driven">
 		<xsd:annotation>
@@ -18,12 +16,28 @@
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="interceptors" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation source="java:org.springframework.web.servlet.HandlerInterceptor"><![CDATA[
+	The ordered list of interceptors that intercept HTTP Servlet Requests mapped to Controllers.
+	Interceptors allow a request to be pre/post processed before/after handling.
+	Each inteceptor should be configured as an inner bean that implements the org.springframework.web.servlet.HandlerInterceptor interface.
+						]]></xsd:documentation>
+					</xsd:annotation>			
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element ref="beans:bean" maxOccurs="unbounded" />
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>		
 			<xsd:attribute name="conversion-service" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation source="java:org.springframework.core.convert.ConversionService"><![CDATA[
 	The bean name of the ConversionService that is to be used for type conversion during field binding.
 	This attribute is not required, and only needs to be specified explicitly if custom converters need to be configured.
-	If not specified, a DefaultConversionService is registered that contains converters to/from standard JDK types.
+	If not specified, a default FormattingConversionService is registered that contains converters to/from standard JDK types.
 	In addition, full support for date/time formatting will be installed if the Joda Time library is present on the classpath.
 					]]></xsd:documentation>
 					<xsd:appinfo>
@@ -46,7 +60,7 @@
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
-			</xsd:attribute>			
+			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
index 162011420ad..b3bfeee9f42 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -130,6 +130,19 @@ public class MvcNamespaceTests {
 		assertTrue(container.getBean(TestValidator.class).validatorInvoked);
 		assertFalse(handler.recordedValidationError);
 	}
+	
+	@Test
+	public void testInterceptors() throws Exception {
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(container);
+		reader.loadBeanDefinitions(new ClassPathResource("mvc-config-interceptors.xml", getClass()));
+		assertEquals(4, container.getBeanDefinitionCount());
+		DefaultAnnotationHandlerMapping mapping = container.getBean(DefaultAnnotationHandlerMapping.class);
+		assertNotNull(mapping);
+		assertEquals(0, mapping.getOrder());
+		AnnotationMethodHandlerAdapter adapter = container.getBean(AnnotationMethodHandlerAdapter.class);
+		assertNotNull(adapter);
+		assertNotNull(container.getBean(FormattingConversionServiceFactoryBean.class));
+	}
 
 	@Controller
 	public static class TestController {
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
new file mode 100644
index 00000000000..79e8a94e20a
--- /dev/null
+++ b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+
+	<mvc:annotation-driven>
+		<mvc:interceptors>
+			<bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />
+			<bean class="org.springframework.web.servlet.i18n.ThemeChangeInterceptor" />
+		</mvc:interceptors>
+	</mvc:annotation-driven>
+	
+</beans>