You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2007/01/20 17:28:44 UTC
svn commit: r498140 - in /tomcat:
container/tc5.5.x/webapps/docs/changelog.xml
container/tc5.5.x/webapps/host-manager/WEB-INF/web.xml
servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/examples/WEB-INF/web.xml
Author: markt
Date: Sat Jan 20 08:28:43 2007
New Revision: 498140
URL: http://svn.apache.org/viewvc?view=rev&rev=498140
Log:
As identified in bug 40507, update webapps to use a servlet 2.4 xsd. Patch provided by Chris Halstead.
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/web.xml
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/examples/WEB-INF/web.xml
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=498140&r1=498139&r2=498140
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Jan 20 08:28:43 2007
@@ -312,6 +312,10 @@
<bug>39572</bug>: Improvements to CompressionFilter example provided by
Eric Hedström. (markt)
</fix>
+ <update>
+ <bug>40507</bug>: Update host-manager and servlet-examples web-apps to
+ use the servlet 2.4 xsd. Patch provided by Chris Halstead. (markt)
+ </update>
<fix>
<bug>40581</bug>: Add information on the use of a symbloic link as the
docBase for a Context to the Context documentation. (markt)
Modified: tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/web.xml?view=diff&rev=498140&r1=498139&r2=498140
==============================================================================
--- tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/web.xml Sat Jan 20 08:28:43 2007
@@ -1,10 +1,9 @@
<?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 Manager Application</display-name>
<description>
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/examples/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/examples/WEB-INF/web.xml?view=diff&rev=498140&r1=498139&r2=498140
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/examples/WEB-INF/web.xml (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/examples/WEB-INF/web.xml Sat Jan 20 08:28:43 2007
@@ -16,11 +16,10 @@
limitations under the License.
-->
-<!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>Servlet 2.4 Examples</display-name>
<description>
@@ -223,28 +222,28 @@
</env-entry-->
<env-entry>
<env-entry-name>minExemptions</env-entry-name>
- <env-entry-value>1</env-entry-value>
<env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>1</env-entry-value>
</env-entry>
<env-entry>
<env-entry-name>foo/name1</env-entry-name>
- <env-entry-value>value1</env-entry-value>
<env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>value1</env-entry-value>
</env-entry>
<env-entry>
<env-entry-name>foo/bar/name2</env-entry-name>
- <env-entry-value>true</env-entry-value>
<env-entry-type>java.lang.Boolean</env-entry-type>
+ <env-entry-value>true</env-entry-value>
</env-entry>
<env-entry>
<env-entry-name>name3</env-entry-name>
- <env-entry-value>1</env-entry-value>
<env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>1</env-entry-value>
</env-entry>
<env-entry>
<env-entry-name>foo/name4</env-entry-name>
- <env-entry-value>10</env-entry-value>
<env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>10</env-entry-value>
</env-entry>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org