From 59a050f3b91c9d7d93beb73acedfebbdaa963a8a Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@gopivotal.com>
Date: Mon, 28 Apr 2014 16:51:10 +0200
Subject: [PATCH] Include more guidance about DispatcherServlet context

Also update <mvc:annotation-driven /> comment in XSD.

Issue: SPR-11703
---
 .../web/servlet/config/spring-mvc-4.0.xsd     |  2 +-
 src/asciidoc/index.adoc                       | 35 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
index 293a09cb03..5846e0f391 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
@@ -15,7 +15,7 @@
 		<xsd:annotation>
 			<xsd:documentation source="java:org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"><![CDATA[
 	Configures the annotation-driven Spring MVC Controller programming model.
-	Note that, with Spring 3.0, this tag works in Servlet MVC only!
+	Note that this tag works in Web MVC only, not in Portlet MVC!
 
 	See org.springframework.web.servlet.config.annotation.EnableWebMvc Javadoc for
 	information on code-based alternatives to enabling annotation-driven Spring MVC
diff --git a/src/asciidoc/index.adoc b/src/asciidoc/index.adoc
index b25597b11f..7e9c2111b7 100644
--- a/src/asciidoc/index.adoc
+++ b/src/asciidoc/index.adoc
@@ -28200,6 +28200,37 @@ With the above Servlet configuration in place, you will need to have a file call
 Spring Web MVC-specific components (beans). You can change the exact location of this
 configuration file through a Servlet initialization parameter (see below for details).
 
+It is also possible to have just one root context for single DispatcherServlet scenarios
+by setting an empty contextConfigLocation servlet init parameter, as shown below:
+
+[source,xml,indent=0]
+[subs="verbatim,quotes"]
+----
+	<web-app>
+		<context-param>
+			<param-name>contextConfigLocation</param-name>
+			<param-value>/WEB-INF/root-context.xml</param-value>
+		</context-param>
+		<servlet>
+			<servlet-name>dispatcher</servlet-name>
+			<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+			<init-param>
+				<param-name>contextConfigLocation</param-name>
+				<param-value></param-value>
+			</init-param>
+			<load-on-startup>1</load-on-startup>
+		</servlet>
+		<servlet-mapping>
+			<servlet-name>dispatcher</servlet-name>
+			<url-pattern>/*</url-pattern>
+		</servlet-mapping>
+		<listener>
+			<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+		</listener>
+	</web-app>
+----
+
+
 The `WebApplicationContext` is an extension of the plain `ApplicationContext` that has
 some extra features necessary for web applications. It differs from a normal
 `ApplicationContext` in that it is capable of resolving themes (see
@@ -31888,7 +31919,9 @@ To enable MVC Java config add the annotation `@EnableWebMvc` to one of your
 	}
 ----
 
-To achieve the same in XML use the `mvc:annotation-driven` element:
+To achieve the same in XML use the `mvc:annotation-driven` element in your
+DispatcherServlet context (or in your root context if you have no DispatcherServlet
+context defined):
 
 [source,xml,indent=0]
 [subs="verbatim,quotes"]
-- 
GitLab