From 330bffd647b372fc9bf742879e1216df724e7f72 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Wed, 11 Nov 2009 15:26:08 +0000
Subject: [PATCH] mvc namespace conversion-service and validator attributes

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2328 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../web/servlet/config/spring-mvc-3.0.xsd     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

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 4541dba9f94..1e386b4bc3f 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
@@ -23,6 +23,34 @@
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
+		<xsd:complexType>
+			<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.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="java:org.springframework.core.convert.ConversionService" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="validator" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:org.springframework.validation.Validator"><![CDATA[
+	The bean name of the Validator that is to be used to validate Controller model objects.
+	This attribute is not required, and only needs to be specified explicitly if a custom Validator needs to be configured.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="java:org.springframework.validation.Validator" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>			
+		</xsd:complexType>
 	</xsd:element>
 
 </xsd:schema>
\ No newline at end of file