From 26a1bed4fd4e574a4ded70e60fd2f3fd5c177875 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Mon, 30 Nov 2009 16:32:59 +0000
Subject: [PATCH] renamed path element to mapping per code review

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2551 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../servlet/config/InterceptorsBeanDefinitionParser.java    | 4 ++--
 .../springframework/web/servlet/config/spring-mvc-3.0.xsd   | 4 ++--
 .../web/servlet/config/mvc-config-interceptors.xml          | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
index d82341ae0d8..b3f3c3e0b3e 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
@@ -44,10 +44,10 @@ class InterceptorsBeanDefinitionParser implements BeanDefinitionParser {
 			String[] pathPatterns;
 			BeanDefinitionHolder interceptorDef;
 			if ("interceptor".equals(interceptor.getLocalName())) {
-				List<Element> paths = DomUtils.getChildElementsByTagName(interceptor, "path");
+				List<Element> paths = DomUtils.getChildElementsByTagName(interceptor, "mapping");
 				pathPatterns = new String[paths.size()];
 				for (int i = 0; i < paths.size(); i++) {
-					pathPatterns[i] = paths.get(i).getAttribute("value");
+					pathPatterns[i] = paths.get(i).getAttribute("path");
 				}
 				Element interceptorBean = DomUtils.getChildElementByTagName(interceptor, "bean");
 				interceptorDef = parserContext.getDelegate().parseBeanDefinitionElement(interceptorBean);
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 0929de414e3..3959ed29e58 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
@@ -75,9 +75,9 @@
 					</xsd:annotation>
 					<xsd:complexType>
 						<xsd:sequence>
-							<xsd:element name="path" maxOccurs="unbounded">
+							<xsd:element name="mapping" maxOccurs="unbounded">
 								<xsd:complexType>
-									<xsd:attribute name="value" type="xsd:string" use="required">
+									<xsd:attribute name="path" type="xsd:string" use="required">
 										<xsd:annotation>
 											<xsd:documentation><![CDATA[
 	A path into the application intercepted by this interceptor.
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
index 691300f9232..27a9e06bc9e 100644
--- 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
@@ -10,12 +10,12 @@
 	<mvc:interceptors>
 		<bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />
 		<mvc:interceptor>
-			<mvc:path value="/**" />
+			<mvc:mapping path="/**" />
 			<bean class="org.springframework.web.servlet.theme.ThemeChangeInterceptor" />
 		</mvc:interceptor>
 		<mvc:interceptor>
-			<mvc:path value="/logged/**" />
-			<mvc:path value="/foo/logged" />
+			<mvc:mapping path="/logged/**" />
+			<mvc:mapping path="/foo/logged" />
 			<bean class="org.springframework.web.context.request.Log4jNestedDiagnosticContextInterceptor" />
 		</mvc:interceptor>
 	</mvc:interceptors>