Author: fschumacher
Date: Sun Mar 13 15:31:14 2016
New Revision: 1734818
URL: http://svn.apache.org/viewvc?rev=1734818&view=rev
Log:
Change web.xml fragments in test to use web-app_3_1.xsd
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml
tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml?rev=1734818&r1=1734817&r2=1734818&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
Sun Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<post-construct>
<lifecycle-callback-class>test.TestServlet</lifecycle-callback-class>
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml?rev=1734818&r1=1734817&r2=1734818&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml Sun
Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<absolute-ordering>
<name>bar</name>
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml?rev=1734818&r1=1734817&r2=1734818&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
Sun Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<post-construct>
<lifecycle-callback-class>test.TestServlet</lifecycle-callback-class>
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml?rev=1734818&r1=1734817&r2=1734818&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml Sun
Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<absolute-ordering>
<name>foo</name>
Modified: tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml?rev=1734818&r1=1734817&r2=1734818&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml Sun Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<display-name>Tomcat Test Application</display-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
