From 19ec3654df45f23fb2bc148d5bcb2f7e086d4a31 Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Mon, 13 Apr 2009 17:46:21 +0000
Subject: [PATCH] added the rest chapter to the build

---
 spring-framework-reference/src/rest.xml       | 62 +++++++++----------
 .../src/spring-framework-reference.xml        |  2 +
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/spring-framework-reference/src/rest.xml b/spring-framework-reference/src/rest.xml
index e3dba834263..6285985c7e0 100644
--- a/spring-framework-reference/src/rest.xml
+++ b/spring-framework-reference/src/rest.xml
@@ -230,26 +230,26 @@ public class RelativePathUriTemplateController {
       <para>Here is an example configuration of a
       <classname>ContentNegotiatingViewResolver</classname></para>
 
-      <programlisting language="xml">	&lt;bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver"&gt;
-		&lt;property name="mediaTypes"&gt;
-			&lt;map&gt;
-				&lt;entry key="atom" value="application/atom+xml"/&gt;
-				&lt;entry key="html" value="text/html"/&gt;
-			&lt;/map&gt;
-		&lt;/property&gt;
-		&lt;property name="viewResolvers"&gt;
-			&lt;list&gt;
-				&lt;bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/&gt;
-				&lt;bean class="org.springframework.web.servlet.view.InternalResourceViewResolver"&gt;
-					&lt;property name="prefix" value="/WEB-INF/jsp/"/&gt;
-					&lt;property name="suffix" value=".jsp"/&gt;
-				&lt;/bean&gt;
-			&lt;/list&gt;
-		&lt;/property&gt;
-	&lt;/bean&gt;
-	
-	
-	&lt;bean id="content" class="com.springsource.samples.rest.SampleContentAtomView"/&gt;</programlisting>
+      <programlisting language="xml">    &lt;bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver"&gt;
+        &lt;property name="mediaTypes"&gt;
+            &lt;map&gt;
+                &lt;entry key="atom" value="application/atom+xml"/&gt;
+                &lt;entry key="html" value="text/html"/&gt;
+            &lt;/map&gt;
+        &lt;/property&gt;
+        &lt;property name="viewResolvers"&gt;
+            &lt;list&gt;
+                &lt;bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/&gt;
+                &lt;bean class="org.springframework.web.servlet.view.InternalResourceViewResolver"&gt;
+                    &lt;property name="prefix" value="/WEB-INF/jsp/"/&gt;
+                    &lt;property name="suffix" value=".jsp"/&gt;
+                &lt;/bean&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/bean&gt;
+    
+    
+    &lt;bean id="content" class="com.springsource.samples.rest.SampleContentAtomView"/&gt;</programlisting>
 
       <para>The <classname>InternalResourceViewResolver</classname> handles
       the translation of view names and JSP pages while the
@@ -290,16 +290,16 @@ public class RelativePathUriTemplateController {
 
       <programlisting language="java">@Controller
 public class ContentController {
-	
-	private List&lt;SampleContent&gt; contentList = new ArrayList&lt;SampleContent&gt;();
-	
-	@RequestMapping(value="/content", method=RequestMethod.GET)
-	public ModelAndView getContent() {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("content");
-		mav.addObject("sampleContentList", contentList);
-		return mav;
-	}
+    
+    private List&lt;SampleContent&gt; contentList = new ArrayList&lt;SampleContent&gt;();
+    
+    @RequestMapping(value="/content", method=RequestMethod.GET)
+    public ModelAndView getContent() {
+        ModelAndView mav = new ModelAndView();
+        mav.setViewName("content");
+        mav.addObject("sampleContentList", contentList);
+        return mav;
+    }
 
 }</programlisting>
 
@@ -340,7 +340,7 @@ public class ContentController {
         updated to support setting the HTTP method. For example, the following
         snippet taken from the updated Petclinic sample</para>
 
-        <programlisting language="html">&lt;form:form method="delete"&gt;
+        <programlisting language="xml">&lt;form:form method="delete"&gt;
     &lt;p class="submit"&gt;&lt;input type="submit" value="Delete Pet"/&gt;&lt;/p&gt;
 &lt;/form:form&gt;</programlisting>
 
diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/spring-framework-reference/src/spring-framework-reference.xml
index 8daf6c5b967..d6adfa63bdb 100644
--- a/spring-framework-reference/src/spring-framework-reference.xml
+++ b/spring-framework-reference/src/spring-framework-reference.xml
@@ -20,6 +20,7 @@
 <!ENTITY mvc				SYSTEM "mvc.xml">
 <!ENTITY view				SYSTEM "view.xml">
 <!ENTITY web-integration		SYSTEM "web-integration.xml">
+<!ENTITY rest               SYSTEM "rest.xml">
 <!ENTITY portlet            SYSTEM "portlet.xml">
 <!ENTITY remoting			SYSTEM "remoting.xml">
 <!ENTITY ejb				SYSTEM "ejb.xml">
@@ -299,6 +300,7 @@
 		&mvc;
 		&view;
 		&web-integration;
+		&rest;
 		&portlet;
 	</part>
 	<part id="spring-integration">