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

diff --git a/conf/web.xml b/conf/web.xml
index c1b9190..0818791 100644 (file)
--- 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 14cf915..582f2e6 100644 (file)
--- 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>