yoavs 2004/10/25 11:50:42
Modified: tester/web/WEB-INF Tag: TOMCAT_5_0 web.xml
webapps/admin/WEB-INF Tag: TOMCAT_5_0 web.xml
webapps/balancer/WEB-INF Tag: TOMCAT_5_0 web.xml
webapps/docs Tag: TOMCAT_5_0 changelog.xml
webapps/docs/WEB-INF Tag: TOMCAT_5_0 web.xml
webapps/docs/appdev/sample/web/WEB-INF Tag: TOMCAT_5_0
web.xml
webapps/manager/WEB-INF Tag: TOMCAT_5_0 web.xml
webapps/webdav/WEB-INF Tag: TOMCAT_5_0 web.xml
Log:
Bugzilla 31671: Update web.xml files to 2.4 schema where applicable.
Revision Changes Path
No revision
No revision
1.4.2.1 +4 -6 jakarta-tomcat-catalina/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/web/WEB-INF/web.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- web.xml 19 Jul 2003 20:21:12 -0000 1.4
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.4.2.1
@@ -1,12 +1,10 @@
<?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";>
+<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">
<!-- Deployment Descriptor for the Tester Web Application -->
-
-<web-app>
<!-- ========== Filter Definitions ==================================== -->
No revision
No revision
1.8.2.1 +18 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- web.xml 12 Aug 2003 19:41:11 -0000 1.8
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.8.2.1
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004 The Apache Software Foundation
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
-<web-app>
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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">
<display-name>Tomcat Administration Application</display-name>
<description>
No revision
No revision
1.1.2.1 +23 -4 jakarta-tomcat-catalina/webapps/balancer/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/balancer/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- web.xml 20 Nov 2003 18:17:23 -0000 1.1
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.1.2.1
@@ -1,8 +1,27 @@
<?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";>
-<web-app>
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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">
+
+ <display-name>Tomcat Simple Load Balancer Example App</display-name>
+
<!-- BalancerFilter definition -->
<filter>
<filter-name>BalancerFilter</filter-name>
No revision
No revision
1.70.2.56 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.55
retrieving revision 1.70.2.56
diff -u -r1.70.2.55 -r1.70.2.56
--- changelog.xml 22 Oct 2004 18:15:30 -0000 1.70.2.55
+++ changelog.xml 25 Oct 2004 18:50:41 -0000 1.70.2.56
@@ -17,6 +17,9 @@
<section name="Tomcat 5.0.30 (yoavs)">
<subsection name="General">
<changelog>
+ <update>
+ Update web.xml files to 2.4 schema (from 2.3 DTD) where applicable. (yoavs)
+ </update>
</changelog>
</subsection>
No revision
No revision
1.2.2.1 +19 -4 jakarta-tomcat-catalina/webapps/docs/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- web.xml 8 Dec 2002 13:42:11 -0000 1.2
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.2.2.1
@@ -1,10 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004 The Apache Software Foundation
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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">
-<web-app>
<display-name>Tomcat Documentation</display-name>
<description>
Tomcat Documentation.
No revision
No revision
1.1.1.1.2.1 +20 -4
jakarta-tomcat-catalina/webapps/docs/appdev/sample/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/sample/web/WEB-INF/web.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- web.xml 18 Jul 2002 16:48:39 -0000 1.1.1.1
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.1.1.1.2.1
@@ -1,8 +1,24 @@
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004 The Apache Software Foundation
-<web-app>
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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">
<display-name>Hello, World Application</display-name>
<description>
No revision
No revision
1.10.2.1 +18 -4 jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- web.xml 22 Sep 2003 12:35:21 -0000 1.10
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.10.2.1
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004 The Apache Software Foundation
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
-<web-app>
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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">
<display-name>Tomcat Manager Application</display-name>
<description>
No revision
No revision
1.4.2.1 +18 -4 jakarta-tomcat-catalina/webapps/webdav/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/webdav/WEB-INF/web.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- web.xml 25 Feb 2004 22:51:54 -0000 1.4
+++ web.xml 25 Oct 2004 18:50:41 -0000 1.4.2.1
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004 The Apache Software Foundation
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
-<web-app>
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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">
<display-name>Webdav Content Management</display-name>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
