From 517644febf803dbf6cea9134595fd9079e4b66c6 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 1 Aug 2011 09:59:44 +0000
Subject: [PATCH] Simplify mapping for jsp servlet in the default web.xml.
 Multiple url-pattern values in the same servlet-mapping are supported since
 Servlet 2.5.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152722 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/web.xml               | 4 ----
 webapps/docs/changelog.xml | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index c1b9190ef..081879185 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -365,10 +365,6 @@
     <servlet-mapping>
         <servlet-name>jsp</servlet-name>
         <url-pattern>*.jsp</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>jsp</servlet-name>
         <url-pattern>*.jspx</url-pattern>
     </servlet-mapping>
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 14cf91572..582f2e69a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -236,6 +236,10 @@
         configuration in the default <code>server.xml</code>. It was documented
         in 7.0.19 that it has no effect. (kkolinko)
       </update>
+      <update>
+        Simplify mapping for <code>jsp</code> servlet in the default
+        <code>web.xml</code>. (kkolinko)
+      </update>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0