Author: markt
Date: Sun Jul 7 14:00:40 2013
New Revision: 1500432
URL: http://svn.apache.org/r1500432
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55205
Reorder web.xml elements so that it becomes valid against the schema. Patch is
provided by Jeremy Boynes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1500380
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1500432&r1=1500431&r2=1500432&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml Sun Jul 7 14:00:40
2013
@@ -43,9 +43,9 @@
</filter-mapping>
<filter-mapping>
<filter-name>Bug49922</filter-name>
+ <servlet-name>Bug49922Target</servlet-name>
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <servlet-name>Bug49922Target</servlet-name>
</filter-mapping>
<servlet>
<servlet-name>Bug49922Forward</servlet-name>
@@ -98,9 +98,9 @@
<jsp-config>
<jsp-property-group>
- <default-content-type>text/plain</default-content-type>
<url-pattern>/bug49nnn/bug49726a.jsp</url-pattern>
<url-pattern>/bug49nnn/bug49726b.jsp</url-pattern>
+ <default-content-type>text/plain</default-content-type>
</jsp-property-group>
</jsp-config>
@@ -129,8 +129,8 @@
<env-entry>
<description>Resource for testing bug 53465</description>
<env-entry-name>bug53465</env-entry-name>
- <env-entry-value>10</env-entry-value>
<env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>10</env-entry-value>
<mapped-name>Bug53465MappedName</mapped-name>
</env-entry>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1500432&r1=1500431&r2=1500432&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jul 7 14:00:40 2013
@@ -95,6 +95,11 @@
<bug>55204</bug>: Correct namespace used in Servlet 2.4 test web
application. Patch provided by Jeremy Boynes. (markt)
</fix>
+ <fix>
+ <bug>55205</bug>: Reorder elements so web.xml compies with schema for
+ Servlet 3.0 test web application. Patch provided by Jeremy Boynes.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
