Author: kkolinko
Date: Mon Aug  1 09:59:44 2011
New Revision: 1152722

URL: http://svn.apache.org/viewvc?rev=1152722&view=rev
Log:
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.

Modified:
    tomcat/trunk/conf/web.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1152722&r1=1152721&r2=1152722&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Mon Aug  1 09:59:44 2011
@@ -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>
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1152722&r1=1152721&r2=1152722&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug  1 09:59:44 2011
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to