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 {
Here is an example configuration of a
ContentNegotiatingViewResolver
- <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
- <property name="mediaTypes">
- <map>
- <entry key="atom" value="application/atom+xml"/>
- <entry key="html" value="text/html"/>
- </map>
- </property>
- <property name="viewResolvers">
- <list>
- <bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/>
- <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
- <property name="prefix" value="/WEB-INF/jsp/"/>
- <property name="suffix" value=".jsp"/>
- </bean>
- </list>
- </property>
- </bean>
-
-
- <bean id="content" class="com.springsource.samples.rest.SampleContentAtomView"/>
+ <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+ <property name="mediaTypes">
+ <map>
+ <entry key="atom" value="application/atom+xml"/>
+ <entry key="html" value="text/html"/>
+ </map>
+ </property>
+ <property name="viewResolvers">
+ <list>
+ <bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/>
+ <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+ <property name="prefix" value="/WEB-INF/jsp/"/>
+ <property name="suffix" value=".jsp"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+
+ <bean id="content" class="com.springsource.samples.rest.SampleContentAtomView"/>
The InternalResourceViewResolver handles
the translation of view names and JSP pages while the
@@ -290,16 +290,16 @@ public class RelativePathUriTemplateController {
@Controller
public class ContentController {
-
- private List<SampleContent> contentList = new ArrayList<SampleContent>();
-
- @RequestMapping(value="/content", method=RequestMethod.GET)
- public ModelAndView getContent() {
- ModelAndView mav = new ModelAndView();
- mav.setViewName("content");
- mav.addObject("sampleContentList", contentList);
- return mav;
- }
+
+ private List<SampleContent> contentList = new ArrayList<SampleContent>();
+
+ @RequestMapping(value="/content", method=RequestMethod.GET)
+ public ModelAndView getContent() {
+ ModelAndView mav = new ModelAndView();
+ mav.setViewName("content");
+ mav.addObject("sampleContentList", contentList);
+ return mav;
+ }
}
@@ -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
- <form:form method="delete">
+ <form:form method="delete">
<p class="submit"><input type="submit" value="Delete Pet"/></p>
</form:form>
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 @@
+
@@ -299,6 +300,7 @@
&mvc;
&view;
&web-integration;
+ &rest;
&portlet;