Author: markt
Date: Fri May 10 10:19:25 2013
New Revision: 1480975
URL: http://svn.apache.org/r1480975
Log:
Update deployment descriptors to Servlet 3.1
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/trunk/webapps/docs/WEB-INF/web.xml
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/trunk/webapps/manager/WEB-INF/web.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri May 10
10:19:25 2013
@@ -630,12 +630,12 @@ public class WebXml {
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
// Root element
- sb.append("<web-app xmlns=\"http://java.sun.com/xml/ns/javaee\"\n";);
+ sb.append("<web-app xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\"\n";);
sb.append(" xmlns:xsi=");
sb.append("\"http://www.w3.org/2001/XMLSchema-instance\"\n";);
sb.append(" xsi:schemaLocation=");
- sb.append("\"http://java.sun.com/xml/ns/javaee"; +
- " http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"\n";);
+ sb.append("\"http://xmlns.jcp.org/xml/ns/javaee"; +
+ " http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd\"\n";);
sb.append(" version=\"");
sb.append(getVersion());
sb.append("\"\n");
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Fri May 10
10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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-fragment_3_0.xsd";
- version="3.0"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<name>org_apache_tomcat_websocket</name>
<distributable/>
Modified:
tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ 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/trunk/test/org/apache/catalina/startup/web-1ordering.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml Fri May 10
10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ 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/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ 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/trunk/test/org/apache/catalina/startup/web-2ordering.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml Fri May 10
10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ 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/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml Fri
May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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-fragment_3_0.xsd";
- version="3.0"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<name>name1</name>
</web-fragment>
\ No newline at end of file
Modified:
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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-fragment_3_0.xsd";
- version="3.0"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<ordering>
<before>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml Fri
May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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-fragment_3_0.xsd";
- version="3.0"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<name>name1</name>
<name>name2</name>
Modified:
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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-fragment_3_0.xsd";
- version="3.0"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<ordering>
<after>
Modified: tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/WEB-INF/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/ROOT/WEB-INF/web.xml Fri May 10 10:19:25 2013
@@ -15,12 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<display-name>Welcome to Tomcat</display-name>
Modified: tomcat/trunk/webapps/docs/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/WEB-INF/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/docs/WEB-INF/web.xml Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<display-name>Tomcat Documentation</display-name>
Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="false">
<description>
Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Fri May 10 10:19:25 2013
@@ -15,12 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<display-name>Tomcat Host Manager Application</display-name>
Modified: tomcat/trunk/webapps/manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/web.xml Fri May 10 10:19:25 2013
@@ -15,12 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+<web-app xmlns="http://xmlns.jcp.org/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"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<display-name>Tomcat Manager Application</display-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
