tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/webdav/WEB-INF web.xml
Date Mon, 25 Oct 2004 19:00:23 GMT
yoavs       2004/10/25 12:00:23

  Modified:    tester/web/WEB-INF web.xml
               webapps/admin/WEB-INF web.xml
               webapps/balancer/WEB-INF web.xml
               webapps/docs changelog.xml
               webapps/docs/WEB-INF web.xml
               webapps/docs/appdev/sample/web/WEB-INF web.xml
               webapps/jmxremote/WEB-INF web.xml
               webapps/manager/WEB-INF web.xml
               webapps/webdav/WEB-INF web.xml
  Log:
  Bugzilla 31671: update web.xml files to 2.4 schema where applicable.
  
  Revision  Changes    Path
  1.5       +4 -8      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.5
  diff -u -r1.4 -r1.5
  --- web.xml	19 Jul 2003 20:21:12 -0000	1.4
  +++ web.xml	25 Oct 2004 19:00:22 -0000	1.5
  @@ -1,12 +1,8 @@
   <?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">
  -
  -<!-- Deployment Descriptor for the Tester Web Application -->
  -
  -<web-app>
  +<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">
   
       <!-- ========== Filter Definitions ==================================== -->
   
  
  
  
  1.12      +4 -6      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- web.xml	16 Aug 2004 23:31:26 -0000	1.11
  +++ web.xml	25 Oct 2004 19:00:22 -0000	1.12
  @@ -1,10 +1,8 @@
   <?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>
  +<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>
  
  
  
  1.2       +10 -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.2
  diff -u -r1.1 -r1.2
  --- web.xml	20 Nov 2003 18:17:23 -0000	1.1
  +++ web.xml	25 Oct 2004 19:00:22 -0000	1.2
  @@ -1,8 +1,14 @@
   <?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>
  +<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>
  +  <description>
  +    Tomcat Simple Load Balancer Example App
  +  </description>
  +
     <!-- BalancerFilter definition -->
     <filter>
       <filter-name>BalancerFilter</filter-name>
  
  
  
  1.151     +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.150
  retrieving revision 1.151
  diff -u -r1.150 -r1.151
  --- changelog.xml	25 Oct 2004 15:29:56 -0000	1.150
  +++ changelog.xml	25 Oct 2004 19:00:22 -0000	1.151
  @@ -29,6 +29,9 @@
   <section name="Tomcat 5.5.4 (yoavs)">
     <subsection name="General">
       <changelog>
  +      <fix>
  +        <bug>31671</bug>: Update web.xml files to 2.4 schema where applicable.
(yoavs)
  +      </fix>
       </changelog>
     </subsection>
     
  
  
  
  1.3       +4 -5      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.3
  diff -u -r1.2 -r1.3
  --- web.xml	8 Dec 2002 13:42:11 -0000	1.2
  +++ web.xml	25 Oct 2004 19:00:23 -0000	1.3
  @@ -1,10 +1,9 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<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">
   
  -<!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>
     <display-name>Tomcat Documentation</display-name>
     <description>
        Tomcat Documentation.
  
  
  
  1.2       +5 -5      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
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml	18 Jul 2002 16:48:39 -0000	1.1
  +++ web.xml	25 Oct 2004 19:00:23 -0000	1.2
  @@ -1,8 +1,8 @@
  -<!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>
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +<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>
  
  
  
  1.2       +19 -6     jakarta-tomcat-catalina/webapps/jmxremote/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/jmxremote/WEB-INF/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml	6 Oct 2004 15:17:24 -0000	1.1
  +++ web.xml	25 Oct 2004 19:00:23 -0000	1.2
  @@ -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>JMX Remote Connector Loader</display-name>
     <description>
   	Will start Jmx RMI connector if JMX is available.
  @@ -17,8 +32,6 @@
         <param-name>debug</param-name>
         <param-value>0</param-value>
       </init-param>
  -<!-- 
  --->    
       <load-on-startup>1</load-on-startup>
     </servlet>
   
  
  
  
  1.11      +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.11
  diff -u -r1.10 -r1.11
  --- web.xml	22 Sep 2003 12:35:21 -0000	1.10
  +++ web.xml	25 Oct 2004 19:00:23 -0000	1.11
  @@ -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>
  
  
  
  1.5       +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.5
  diff -u -r1.4 -r1.5
  --- web.xml	25 Feb 2004 22:51:54 -0000	1.4
  +++ web.xml	25 Oct 2004 19:00:23 -0000	1.5
  @@ -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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message