[jboss-cvs] JBossAS SVN: r82331 - projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-12-16 23:08:11 -0500 (Tue, 16 Dec 2008)
New Revision: 82331

Modified:
   projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/clientcert-auth-web.xml
   projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/jbosstest-web.xml
   projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/manifest-web.xml
   projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/root-web.xml
Log:
[EJBTHREE-1241] Updated dd/web XML to proper schema version, test passes

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/clientcert-auth-web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/clientcert-auth-web.xml	2008-12-17 03:54:44 UTC (rev 82330)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/clientcert-auth-web.xml	2008-12-17 04:08:11 UTC (rev 82331)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-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>
+<web-app version="2.5"
+   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">
+
    <description>Security Tests Using CLIENT-CERT Authentication</description>
 
    <!-- ### Servlets -->

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/jbosstest-web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/jbosstest-web.xml	2008-12-17 03:54:44 UTC (rev 82330)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/jbosstest-web.xml	2008-12-17 04:08:11 UTC (rev 82331)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app version="2.4"
-   xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app version="2.5"
+   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/j2ee
-   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+   http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
    <description>The WebApp Integration Tests Descriptor</description>
 

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/manifest-web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/manifest-web.xml	2008-12-17 03:54:44 UTC (rev 82330)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/manifest-web.xml	2008-12-17 04:08:11 UTC (rev 82331)
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-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>
+<web-app version="2.5"
+   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">
+
    <description>A war that references classes via a manifest Class-Path</description>
 </web-app>

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/root-web.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/root-web.xml	2008-12-17 03:54:44 UTC (rev 82330)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/WEB-INF/root-web.xml	2008-12-17 04:08:11 UTC (rev 82331)
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-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>
+<web-app version="2.5"
+   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">
    <description>A root war</description>
 </web-app>