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">
-
-
+
+
@@ -18,12 +16,28 @@
]]>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +60,7 @@
-
+
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 @@
+
+
+
+
+
+
+
+
+
+
+