From 0b9d98ba1ce8f18b63a80123b86426bae7ac175b Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Mon, 19 Jul 2010 14:20:39 +0000
Subject: [PATCH] disable welcome files (for Servlet 3 compatibility)

---
 src/main/webapp/WEB-INF/web.xml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 4d7a09ab9..768329b1b 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -147,16 +147,16 @@
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 
-    <filter>
-        <filter-name>httpMethodFilter</filter-name>
-        <filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
-    </filter>
+	<filter>
+		<filter-name>httpMethodFilter</filter-name>
+		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>httpMethodFilter</filter-name>
+		<servlet-name>petclinic</servlet-name>
+	</filter-mapping>
 
-    <filter-mapping>
-        <filter-name>httpMethodFilter</filter-name>
-        <servlet-name>petclinic</servlet-name>
-    </filter-mapping>
-    
 	<session-config>
 		<session-timeout>10</session-timeout>
 	</session-config>
@@ -167,6 +167,12 @@
 		<location>/WEB-INF/jsp/uncaughtException.jsp</location>
 	</error-page>
 
+	<!-- eliminate welcome files -->
+	<!-- useful for Servlet 3 container (Tomcat 7 and Jetty 6) -->
+	<welcome-file-list>
+		<welcome-file></welcome-file>
+	</welcome-file-list>
+
 	<!--
 		- Reference to PetClinic database.
 		- Only needed if not using a local DataSource but a JNDI one instead.
@@ -179,4 +185,4 @@
 	</resource-ref>
 	-->
 	
-</web-app>
+</web-app>
\ No newline at end of file