Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-06 06:56:15 +0000
committerGreg Wilkins2013-09-06 06:56:15 +0000
commitef98f89e5c4a8a89dcf0ea464c20edd044762d5e (patch)
treea368fd67f25161ed8935c48454097c00a56b8c9f
parentace43502ad1b2a19d98aa1d1910aad6c90350d70 (diff)
downloadorg.eclipse.jetty.project-ef98f89e5c4a8a89dcf0ea464c20edd044762d5e.tar.gz
org.eclipse.jetty.project-ef98f89e5c4a8a89dcf0ea464c20edd044762d5e.tar.xz
org.eclipse.jetty.project-ef98f89e5c4a8a89dcf0ea464c20edd044762d5e.zip
416680 remove uncovered constraint warning
-rw-r--r--jetty-webapp/src/main/config/etc/webdefault.xml20
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml4
2 files changed, 15 insertions, 9 deletions
diff --git a/jetty-webapp/src/main/config/etc/webdefault.xml b/jetty-webapp/src/main/config/etc/webdefault.xml
index 7c25cf41d7..fc8d7f9801 100644
--- a/jetty-webapp/src/main/config/etc/webdefault.xml
+++ b/jetty-webapp/src/main/config/etc/webdefault.xml
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<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_1.xsd"
+ metadata-complete="false"
+ version="3.1">
<!-- ===================================================================== -->
<!-- This file contains the default descriptor for web applications. -->
@@ -17,13 +23,6 @@
<!-- by the jetty.xml file. -->
<!-- -->
<!-- ===================================================================== -->
-<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_2_5.xsd"
- metadata-complete="true"
- version="2.5"
->
<description>
Default web.xml file.
@@ -525,6 +524,13 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Enable everything but TRACE</web-resource-name>
+ <url-pattern/>/</url-pattern>
+ <http-method-ommission>TRACE</http-method-ommission>
+ </web-resource-collection>
+ </security-constraint>
</web-app>
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
index 51f8aa3060..05467e5827 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
@@ -2,9 +2,9 @@
<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"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
metadata-complete="false"
- version="3.0">
+ version="3.1">
<display-name>Test WebApp</display-name>

Back to the top