From e79e08d7f787d6ae17dd51e8cd8a85ab246113e3 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 16 Jun 2011 22:42:50 +0000
Subject: [PATCH] Prefer / or /app/* over /main in servlet examples

---
 .../org/springframework/web/WebApplicationInitializer.java  | 6 +++---
 spring-framework-reference/src/beans-java.xml               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.springframework.web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/org.springframework.web/src/main/java/org/springframework/web/WebApplicationInitializer.java
index a9b0213794..55932393ee 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/WebApplicationInitializer.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/WebApplicationInitializer.java
@@ -50,7 +50,7 @@ import javax.servlet.ServletException;
  *
  * <servlet-mapping>
  *   <servlet-name>dispatcher</servlet-name>
- *   <url-pattern>/main</url-pattern>
+ *   <url-pattern>/</url-pattern>
  * </servlet-mapping>}</pre>
  *
  * <h3>The code-based approach with {@code WebApplicationInitializer}</h3>
@@ -67,7 +67,7 @@ import javax.servlet.ServletException;
  *      ServletRegistration.Dynamic dispatcher =
  *        container.addServlet("dispatcher", new DispatcherServlet(appContext));
  *      dispatcher.setLoadOnStartup(1);
- *      dispatcher.addMapping("/main");
+ *      dispatcher.addMapping("/");
  *    }
  *
  * }</pre>
@@ -126,7 +126,7 @@ import javax.servlet.ServletException;
  *      ServletRegistration.Dynamic dispatcher =
  *        container.addServlet("dispatcher", new DispatcherServlet(dispatcherContext));
  *      dispatcher.setLoadOnStartup(1);
- *      dispatcher.addMapping("/main");
+ *      dispatcher.addMapping("/");
  *    }
  *
  * }</pre>
diff --git a/spring-framework-reference/src/beans-java.xml b/spring-framework-reference/src/beans-java.xml
index 7d08848118..06725b7801 100644
--- a/spring-framework-reference/src/beans-java.xml
+++ b/spring-framework-reference/src/beans-java.xml
@@ -204,10 +204,10 @@ public class AppConfig {
       &lt;/init-param&gt;
   &lt;/servlet&gt;
 
-  &lt;!-- map all requests for /main/* to the dispatcher servlet --&gt;
+  &lt;!-- map all requests for /app/* to the dispatcher servlet --&gt;
   &lt;servlet-mapping&gt;
       &lt;servlet-name&gt;dispatcher&lt;/servlet-name&gt;
-      &lt;url-pattern&gt;/main/*&lt;/url-pattern&gt;
+      &lt;url-pattern&gt;/app/*&lt;/url-pattern&gt;
   &lt;/servlet-mapping&gt;
 &lt;/web-app&gt;</programlisting></para>
     </section>