thanks to Chris Wolf for the heads up, added the XML namespace declar…

…ation so hopefully we'll deploy nicely in more web containers with less noise
hawtio · Jul 19, 2013 · 872bda8 · 872bda8
1 parent c16679b
commit 872bda8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/hawtio-default/src/main/webapp/WEB-INF/web.xml b/hawtio-default/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+	      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	      version="2.4">
 
   <description>hawtio</description>
 

diff --git a/hawtio-osgi-devmode/src/main/webapp/WEB-INF/web.xml b/hawtio-osgi-devmode/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/j2ee">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+	      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	      version="2.4">
 
   <description>hawtio</description>
   <display-name>hawt.io dev web app</display-name>

diff --git a/hawtio-plugin-examples/simple-plugin/src/main/webapp/WEB-INF/web.xml b/hawtio-plugin-examples/simple-plugin/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/j2ee">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+	      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	      version="2.4">
 
   <description>hawtio</description>
   <display-name>hawt.io simple plugin</display-name>

diff --git a/hawtio-web/src/main/webapp/WEB-INF/web.xml b/hawtio-web/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+	      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	      version="2.4">
 
   <description>hawtio</description>
 

diff --git a/sample/src/main/webapp/WEB-INF/web.xml b/sample/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/j2ee">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+	      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	      version="2.4">
+
   <description>Example hawt.io</description>
   <display-name>Example hawt.io</display-name>