From a9b28cf9bdd540eefef6379d89a290bf4c49a855 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 6 Feb 2009 16:12:13 +0000
Subject: [PATCH] Added content negotiation and MarshallingView to petclinic

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@604 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../main/webapp/WEB-INF/petclinic-servlet.xml | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml
index 592011f1c69..4d4828d9a94 100644
--- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml
+++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml
@@ -64,29 +64,25 @@
 				<entry key="atom" value="#{vets.contentType}"/>
 			</map>
 		</property>
-		<property name="viewResolvers">
-			<list>
-				<!--
-					- The BeanNameViewResolver is used to pick up the visits view name (below).
-					- It has the order property set to 2, which means that this will
-					- be the first view resolver to be used after the delegating content
-					- negotiating view resolver.
-				 -->
-				<bean class="org.springframework.web.servlet.view.BeanNameViewResolver" p:order="1"/>
-				<!--
-				
-					- This bean configures the 'prefix' and 'suffix' properties of
-					- InternalResourceViewResolver, which resolves logical view names
-					- returned by Controllers. For example, a logical view name of "vets"
-					- will be mapped to "/WEB-INF/jsp/vets.jsp".
-				-->
-				<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" p:prefix="/WEB-INF/jsp/"
-						p:suffix=".jsp" p:order="2"/>
-			</list>
-
-		</property>
+		<property name="order" value="0"/>
 	</bean>
 	
+	<!--
+		- The BeanNameViewResolver is used to pick up the visits view name (below).
+		- It has the order property set to 2, which means that this will
+		- be the first view resolver to be used after the delegating content
+		- negotiating view resolver.
+	 -->
+	<bean class="org.springframework.web.servlet.view.BeanNameViewResolver" p:order="1"/>
+	<!--
+
+		- This bean configures the 'prefix' and 'suffix' properties of
+		- InternalResourceViewResolver, which resolves logical view names
+		- returned by Controllers. For example, a logical view name of "vets"
+		- will be mapped to "/WEB-INF/jsp/vets.jsp".
+	-->
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" p:prefix="/WEB-INF/jsp/"
+			p:suffix=".jsp" p:order="2"/>
 
 	<!--
 		- The AtomView rendering a Atom feed of the visits