Author: violetagg
Date: Sun Jul  7 07:25:43 2013
New Revision: 1500380

URL: http://svn.apache.org/r1500380
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/trunk/test/webapp/WEB-INF/web.xml

Modified: tomcat/trunk/test/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/web.xml?rev=1500380&r1=1500379&r2=1500380&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp/WEB-INF/web.xml Sun Jul  7 07:25:43 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>
 



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

Reply via email to