This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 8185591 [cxf-systests-jaxrs] run test without internet connection
8185591 is described below
commit 8185591d9f355a7b892face130c0771f39c72a1d
Author: amarkevich <[email protected]>
AuthorDate: Wed Jan 23 16:19:35 2019 +0300
[cxf-systests-jaxrs] run test without internet connection
---
.../cxf/systest/jaxrs/AbstractSpringServer.java | 19 ++-------
.../cxf/systest/jaxrs/GenericRestServiceImpl.java | 13 +++---
.../org/apache/cxf/systest/jaxrs/IRestService.java | 6 +--
.../jaxrs/JAXRSContinuationsServlet3Test.java | 13 ++----
.../jaxrs/security/AbstractSpringSecurityTest.java | 49 +++++++++-------------
.../JAXRSJaasConfigurationSecurityTest.java | 3 +-
.../jaxrs/security/JAXRSJaasSecurityTest.java | 3 +-
.../jaxrs/src/test/resources/jaxrs/WEB-INF/web.xml | 5 ++-
.../src/test/resources/jaxrs_async/WEB-INF/web.xml | 5 ++-
.../src/test/resources/jaxrs_atom/WEB-INF/web.xml | 5 ++-
.../src/test/resources/jaxrs_cors/WEB-INF/web.xml | 5 ++-
.../resources/jaxrs_databinding/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 5 ++-
.../jaxrs_dispatch_simple/WEB-INF/web.xml | 5 ++-
.../resources/jaxrs_jaas_security/WEB-INF/web.xml | 5 ++-
.../jaxrs_jackson_provider/WEB-INF/web.xml | 5 ++-
.../jaxrs_many_destinations/WEB-INF/web.xml | 5 ++-
.../src/test/resources/jaxrs_nio/WEB-INF/web.xml | 5 ++-
.../resources/jaxrs_non_spring/WEB-INF/web.xml | 5 ++-
.../src/test/resources/jaxrs_proxy/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_security/WEB-INF/web.xml | 5 ++-
.../resources/jaxrs_security_cglib/WEB-INF/web.xml | 5 ++-
.../jaxrs_security_no_annotations/WEB-INF/web.xml | 5 ++-
.../jaxrs_simple_security/WEB-INF/web.xml | 5 ++-
.../resources/jaxrs_soap_blueprint/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_soap_rest/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_spring/WEB-INF/web.xml | 5 ++-
.../jaxrs_spring_providers/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_swagger2/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_unicode/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_uriinfo/WEB-INF/web.xml | 5 ++-
.../resources/jaxrs_uriinfo_match/WEB-INF/web.xml | 5 ++-
.../test/resources/jaxrs_websocket/WEB-INF/web.xml | 5 ++-
.../org/apache/cxf/systest/servlet/web-jaxrs.xml | 5 ++-
.../resources/servlet_as_filter/WEB-INF/web.xml | 5 ++-
35 files changed, 120 insertions(+), 126 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
index 4829dd1..ef329cc 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
@@ -19,12 +19,10 @@
package org.apache.cxf.systest.jaxrs;
-import java.net.URISyntaxException;
-
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.webapp.WebAppContext;
public abstract class AbstractSpringServer extends AbstractBusTestServerBase {
@@ -49,20 +47,9 @@ public abstract class AbstractSpringServer extends
AbstractBusTestServerBase {
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath(contextPath);
+
webappcontext.setBaseResource(Resource.newClassPathResource(resourcePath));
- String warPath = null;
- try {
- warPath = getClass().getResource(resourcePath).toURI().getPath();
- } catch (URISyntaxException e1) {
- e1.printStackTrace();
- }
-
- webappcontext.setWar(warPath);
-
- HandlerCollection handlers = new HandlerCollection();
- handlers.setHandlers(new Handler[] {webappcontext, new
DefaultHandler()});
-
- server.setHandler(handlers);
+ server.setHandler(new HandlerCollection(webappcontext, new
DefaultHandler()));
try {
configureServer(server);
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java
index 5684b3a..a86ef09 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java
@@ -21,18 +21,17 @@ package org.apache.cxf.systest.jaxrs;
import java.util.HashMap;
import java.util.Map;
-@SuppressWarnings("all")
-public class GenericRestServiceImpl<T extends Book, PK extends Long>
implements IRestService<T, PK> {
+public class GenericRestServiceImpl<T extends Book> implements IRestService<T>
{
- private Map entities = new HashMap();
+ private Map<Long, T> entities = new HashMap<>();
- public T getById(PK id) {
- return (T)entities.get((Long)id);
+ public T getById(Long id) {
+ return entities.get(id);
}
- public PK postEntity(T instance) {
+ public Long postEntity(T instance) {
entities.put(1L, instance);
- return (PK)entities.keySet().iterator().next();
+ return entities.keySet().iterator().next();
}
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/IRestService.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/IRestService.java
index 6e8862e..1b50e7b 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/IRestService.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/IRestService.java
@@ -26,10 +26,10 @@ import javax.ws.rs.QueryParam;
@SuppressWarnings("all")
@Path("books")
-public interface IRestService<T extends Book, PK extends Long> {
+public interface IRestService<T extends Book> {
@GET
- T getById(@QueryParam("id") PK id);
+ T getById(@QueryParam("id") Long id);
@POST
- PK postEntity(T instance);
+ Long postEntity(T instance);
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
index 23b4ade..959b2c3 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
@@ -30,7 +30,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.junit.BeforeClass;
@@ -40,17 +39,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JAXRSContinuationsServlet3Test extends
AbstractJAXRSContinuationsTest {
- public static final String PORT = BookContinuationServlet3Server.PORT;
-
@BeforeClass
public static void startServers() throws Exception {
- AbstractResourceInfo.clearAllMaps();
- createStaticBus();
assertTrue("server did not launch correctly",
launchServer(BookContinuationServlet3Server.class));
-
-
}
@Test
@@ -70,7 +63,7 @@ public class JAXRSContinuationsServlet3Test extends
AbstractJAXRSContinuationsTe
public void testClientDisconnect() throws Exception {
ServerLauncher launcher = new
ServerLauncher(BookContinuationClient.class.getName());
assertTrue("server did not launch correctly", launcher.launchServer());
- Thread.sleep(4000);
+ Thread.sleep(4000L);
}
@Test
@@ -116,7 +109,7 @@ public class JAXRSContinuationsServlet3Test extends
AbstractJAXRSContinuationsTe
private static void assertString(Future<Response> future, String check)
throws Exception {
Response response = future.get();
- assertEquals(response.getStatus(), Status.OK.getStatusCode());
+ assertEquals(Status.OK.getStatusCode(), response.getStatus());
String content = response.readEntity(String.class);
assertEquals(check, content);
}
@@ -144,6 +137,6 @@ public class JAXRSContinuationsServlet3Test extends
AbstractJAXRSContinuationsTe
}
protected String getPort() {
- return PORT;
+ return BookContinuationServlet3Server.PORT;
}
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
index 8d76f5e..9cbded9 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
@@ -24,8 +24,9 @@ import java.io.InputStream;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.http.HttpHeaders;
import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
@@ -34,43 +35,31 @@ import static org.junit.Assert.assertEquals;
public abstract class AbstractSpringSecurityTest extends
AbstractBusClientServerTestBase {
- private String getStringFromInputStream(InputStream in) throws Exception {
- return IOUtils.toString(in);
+ protected static String basicAuthHeader(String user, String password) {
+ return "Basic " + Base64Utility.encode((user + ':' +
password).getBytes());
}
- protected String base64Encode(String value) {
- return Base64Utility.encode(value.getBytes());
- }
-
- protected void getBook(String endpointAddress, String user, String
password,
- int expectedStatus)
- throws Exception {
-
- CloseableHttpClient client = HttpClientBuilder.create().build();
- HttpGet get = new HttpGet(endpointAddress);
- get.addHeader("Accept", "application/xml");
- get.addHeader("Authorization",
- "Basic " + base64Encode(user + ":" + password));
- try {
- CloseableHttpResponse response = client.execute(get);
+ protected void getBook(String endpointAddress, String user, String
password, int expectedStatus) throws Exception {
+ try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
+ CloseableHttpResponse response = client.execute(RequestBuilder
+ .get(endpointAddress)
+ .addHeader(HttpHeaders.ACCEPT, "application/xml")
+ .addHeader(HttpHeaders.AUTHORIZATION,
basicAuthHeader(user, password)).build());
assertEquals(expectedStatus,
response.getStatusLine().getStatusCode());
if (expectedStatus == 200) {
- String content = EntityUtils.toString(response.getEntity());
- String resource =
"/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt";
- InputStream expected =
getClass().getResourceAsStream(resource);
- assertEquals("Expected value is wrong",
-
stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
- stripXmlInstructionIfNeeded(content));
+ try (InputStream expected = getClass()
+
.getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt"))
{
+ assertEquals("Expected value is wrong",
+
stripXmlInstructionIfNeeded(IOUtils.toString(expected)),
+
stripXmlInstructionIfNeeded(EntityUtils.toString(response.getEntity())));
+ }
}
- } finally {
- get.releaseConnection();
}
-
}
- private String stripXmlInstructionIfNeeded(String str) {
+
+ private static String stripXmlInstructionIfNeeded(String str) {
if (str != null && str.startsWith("<?xml")) {
- int index = str.indexOf("?>");
- str = str.substring(index + 2);
+ return str.substring(str.indexOf("?>") + 2);
}
return str;
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasConfigurationSecurityTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasConfigurationSecurityTest.java
index 3498bbf..46bf3f8 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasConfigurationSecurityTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasConfigurationSecurityTest.java
@@ -62,8 +62,7 @@ public class JAXRSJaasConfigurationSecurityTest extends
AbstractSpringSecurityTe
"http://localhost:"; + PORT +
"/service/jaasConfigFilter/bookstorestorage/thosebooks/123";
WebClient wc = WebClient.create(endpointAddress);
wc.accept("text/xml");
- wc.header(HttpHeaders.AUTHORIZATION,
- "Basic " + base64Encode("foo" + ":" + "bar1"));
+ wc.header(HttpHeaders.AUTHORIZATION, basicAuthHeader("foo", "bar1"));
Response r = wc.get();
assertEquals(401, r.getStatus());
Object wwwAuthHeader =
r.getMetadata().getFirst(HttpHeaders.WWW_AUTHENTICATE);
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
index 3915f20..114a46e 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
@@ -129,8 +129,7 @@ public class JAXRSJaasSecurityTest extends
AbstractSpringSecurityTest {
"http://localhost:"; + PORT +
"/service/jaas2/bookstorestorage/thosebooks/123";
WebClient wc = WebClient.create(endpointAddress);
wc.accept("text/xml,text/html");
- wc.header(HttpHeaders.AUTHORIZATION,
- "Basic " + base64Encode("foo" + ":" + "bar1"));
+ wc.header(HttpHeaders.AUTHORIZATION, basicAuthHeader("foo", "bar1"));
Response r = wc.get();
assertEquals(307, r.getStatus());
Object locationHeader = r.getMetadata().getFirst(HttpHeaders.LOCATION);
diff --git a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/web.xml
index 619dc1a..7ae0013 100644
--- a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
index 402a8d4..91f4037 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_5.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/web.xml
index 9811d72..b39d6f2 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/web.xml
index 5fb52c5..8da7658 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<servlet>
<servlet-name>CXFServlet</servlet-name>
<display-name>CXF Servlet</display-name>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/web.xml
index f5ab779..016c84a 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
index a221233..b9fe1c8 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/web.xml
index b55ed6a..3b9b9c9 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/web.xml
index a832dee..9e7946c 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/web.xml
index 856b6e1..7390d5d 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/web.xml
index e9d31ef..161aad3 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_nio/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_nio/WEB-INF/web.xml
index 3e984d3..0790e3b 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_nio/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_nio/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml
index c861065..c0f0cb0 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextParam</param-name>
<param-value>contextParamValue</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/web.xml
index 2883530..d36c960 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/web.xml
index 8219955..609faa6 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
index 8219955..609faa6 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
index 8219955..609faa6 100644
---
a/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
+++
b/systests/jaxrs/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/web.xml
index 90dd7ce..4d32736 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
index 02660f9..a04e3fc 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>blueprintLocation</param-name>
<param-value>jaxrs_soap_blueprint/WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/web.xml
index ced255a..eb63276 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/web.xml
index a8cae3f..97aba6e 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/web.xml
index b142093..3ee223c 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<servlet>
<servlet-name>CXFServlet</servlet-name>
<display-name>CXF Servlet</display-name>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_swagger2/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_swagger2/WEB-INF/web.xml
index 25f77aa..10d0908 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_swagger2/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_swagger2/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<filter>
<filter-name>xforwarded</filter-name>
<filter-class>org.apache.cxf.systest.jaxrs.XForwardedServletFilter</filter-class>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/web.xml
index a8cae3f..97aba6e 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/web.xml
index bf7edd8..177a82f 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_uriinfo/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<filter>
<filter-name>xforwarded</filter-name>
<filter-class>org.apache.cxf.systest.jaxrs.XForwardedServletFilter</filter-class>
diff --git
a/systests/jaxrs/src/test/resources/jaxrs_uriinfo_match/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_uriinfo_match/WEB-INF/web.xml
index a8cae3f..97aba6e 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_uriinfo_match/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_uriinfo_match/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_websocket/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_websocket/WEB-INF/web.xml
index 76d7687..5e010e0 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_websocket/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_websocket/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
diff --git
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/servlet/web-jaxrs.xml
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/servlet/web-jaxrs.xml
index 1adeaa3..175b1c7 100644
---
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/servlet/web-jaxrs.xml
+++
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/servlet/web-jaxrs.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<servlet>
<servlet-name>CXFServlet</servlet-name>
<display-name>CXF Servlet</display-name>
diff --git
a/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/web.xml
index 5be38f1..4dba18d 100644
--- a/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +18,9 @@
under the License.
-->
<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
<filter>
<filter-name>CXFServlet</filter-name>
<filter-class>
