Author: markt
Date: Sat Feb 24 08:20:30 2007
New Revision: 511294
URL: http://svn.apache.org/viewvc?view=rev&rev=511294
Log:
Use correct definition for servlet 2.5 xsd.
Modified:
tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml?view=diff&rev=511294&r1=511293&r2=511294
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/WEB-INF/web.xml Sat Feb 24 08:20:30 2007
@@ -16,10 +16,10 @@
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_5.xsd";
- version="2.5">
+<web-app xmlns="http://java.sun.com/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_2_5.xsd";
+ version="2.5">
<display-name>Welcome to Tomcat</display-name>
<description>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml?view=diff&rev=511294&r1=511293&r2=511294
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/WEB-INF/web.xml Sat Feb 24 08:20:30 2007
@@ -1,8 +1,8 @@
<?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_5.xsd";
- version="2.5">
+<web-app xmlns="http://java.sun.com/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_2_5.xsd";
+ version="2.5">
<display-name>Tomcat Documentation</display-name>
<description>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=511294&r1=511293&r2=511294
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Feb 24 08:20:30 2007
@@ -27,6 +27,14 @@
</update>
</changelog>
</subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ Fix previous update to servlet 2.5 xsd to use correct declaration.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.10 (remm)">
<subsection name="Catalina">
Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml?view=diff&rev=511294&r1=511293&r2=511294
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml Sat Feb 24 08:20:30
2007
@@ -16,10 +16,10 @@
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_5.xsd";
- version="2.5">
+<web-app xmlns="http://java.sun.com/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_2_5.xsd";
+ version="2.5">
<description>
Servlet and JSP Examples.
Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml?view=diff&rev=511294&r1=511293&r2=511294
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Sat Feb 24
08:20:30 2007
@@ -1,9 +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_5.xsd";
- version="2.5">
+<web-app xmlns="http://java.sun.com/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_2_5.xsd";
+ version="2.5">
<display-name>Tomcat Manager Application</display-name>
<description>
Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?view=diff&rev=511294&r1=511293&r2=511294
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Sat Feb 24 08:20:30
2007
@@ -16,10 +16,10 @@
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_5.xsd";
- version="2.5">
+<web-app xmlns="http://java.sun.com/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_2_5.xsd";
+ version="2.5">
<display-name>Tomcat Manager Application</display-name>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
