[jboss-cvs] JBossAS SVN: r58639 - in trunk/testsuite/src/resources: bench/ear/META-INF deployers/ear1/META-INF deployers/ear1unpacked/META-INF deployers/ear2/META-INF isolation/a/ear/META-INF isolation/b/ear/META-INF isolation/c/ear/META-INF jmx/eardepends/app/META-INF jmx/eardeployment/META-INF jmx/loading/cpmanifest/META-INF jmx/loading/ext naming/ear/META-INF perf testbeancluster timer/ear util/scheduler web/META-INF web/classpath web/federation/genericheader webservice/jbws128/META-INF webservice/ws4eesimple-client/META-INF

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Nov 20 06:08:57 EST 2006


Author: alex.loubyansky at jboss.com
Date: 2006-11-20 06:08:40 -0500 (Mon, 20 Nov 2006)
New Revision: 58639

Modified:
   trunk/testsuite/src/resources/bench/ear/META-INF/application.xml
   trunk/testsuite/src/resources/deployers/ear1/META-INF/application.xml
   trunk/testsuite/src/resources/deployers/ear1unpacked/META-INF/application.xml
   trunk/testsuite/src/resources/deployers/ear2/META-INF/application.xml
   trunk/testsuite/src/resources/isolation/a/ear/META-INF/application.xml
   trunk/testsuite/src/resources/isolation/b/ear/META-INF/application.xml
   trunk/testsuite/src/resources/isolation/c/ear/META-INF/application.xml
   trunk/testsuite/src/resources/jmx/eardepends/app/META-INF/application.xml
   trunk/testsuite/src/resources/jmx/eardeployment/META-INF/application.xml
   trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/application.xml
   trunk/testsuite/src/resources/jmx/loading/ext/application.xml
   trunk/testsuite/src/resources/naming/ear/META-INF/application.xml
   trunk/testsuite/src/resources/perf/application.xml
   trunk/testsuite/src/resources/testbeancluster/application.xml
   trunk/testsuite/src/resources/timer/ear/application.xml
   trunk/testsuite/src/resources/util/scheduler/application.xml
   trunk/testsuite/src/resources/web/META-INF/application-bad.xml
   trunk/testsuite/src/resources/web/META-INF/application-good.xml
   trunk/testsuite/src/resources/web/META-INF/application.xml
   trunk/testsuite/src/resources/web/META-INF/application2.xml
   trunk/testsuite/src/resources/web/classpath/application.xml
   trunk/testsuite/src/resources/web/federation/genericheader/application.xml
   trunk/testsuite/src/resources/webservice/jbws128/META-INF/application.xml
   trunk/testsuite/src/resources/webservice/ws4eesimple-client/META-INF/application.xml
Log:
making application.xml's valid

Modified: trunk/testsuite/src/resources/bench/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/bench/ear/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/bench/ear/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
 
 <application>
   <display-name>dummy</display-name>

Modified: trunk/testsuite/src/resources/deployers/ear1/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/ear1/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/deployers/ear1/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -10,7 +10,7 @@
    <display-name>EAR Deployment Test</display-name>
 
    <module><ejb>testdeployers-bean1ejb.jar</ejb></module>
-   <module><web><web-uri>testdeployers-web1.war</web-uri></web></module>
+   <module><web><web-uri>testdeployers-web1.war</web-uri><context-root>testdeployers-web1</context-root></web></module>
    <module><connector>testdeployers-mcf1.rar</connector></module>
    <module><java>testdeployers-client1.jar</java></module>
 

Modified: trunk/testsuite/src/resources/deployers/ear1unpacked/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/ear1unpacked/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/deployers/ear1unpacked/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -10,7 +10,7 @@
    <display-name>EAR Deployment Test</display-name>
 
    <module><ejb>testdeployers-bean1ejb.jar</ejb></module>
-   <module><web><web-uri>testdeployers-web1.war</web-uri></web></module>
+   <module><web><web-uri>testdeployers-web1.war</web-uri><context-root>testdeployers-web1</context-root></web></module>
    <module><connector>testdeployers-mcf1.rar</connector></module>
    <module><java>testdeployers-client1.jar</java></module>
 

Modified: trunk/testsuite/src/resources/deployers/ear2/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/ear2/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/deployers/ear2/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -10,7 +10,7 @@
    <display-name>EAR Deployment Test</display-name>
 
    <module><ejb>unpacked-bean1ejb.jar</ejb></module>
-   <module><web><web-uri>unpacked-web1.war</web-uri></web></module>
+   <module><web><web-uri>unpacked-web1.war</web-uri><context-root>unpacked-web1</context-root></web></module>
    <module><connector>unpacked-mcf1.rar</connector></module>
    <module><java>unpacked-client1.jar</java></module>
 

Modified: trunk/testsuite/src/resources/isolation/a/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/isolation/a/ear/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/isolation/a/ear/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>isolationA</display-name>
 	<module>

Modified: trunk/testsuite/src/resources/isolation/b/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/isolation/b/ear/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/isolation/b/ear/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>isolationB</display-name>
 	<module>

Modified: trunk/testsuite/src/resources/isolation/c/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/isolation/c/ear/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/isolation/c/ear/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -5,7 +5,7 @@
 <application>
    <display-name>isolation test</display-name>
    <module>
-      <web><web-uri>isolationC.war</web-uri></web>
+      <web><web-uri>isolationC.war</web-uri><context-root>isolationC</context-root></web>
    </module>
 </application>
 

Modified: trunk/testsuite/src/resources/jmx/eardepends/app/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardepends/app/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/jmx/eardepends/app/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
   <display-name>EAR Depends EJB - SAR</display-name>
   

Modified: trunk/testsuite/src/resources/jmx/eardeployment/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardeployment/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/jmx/eardeployment/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest Ear Deployment Testsuite</display-name>
 

Modified: trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest CPManifest Testsuite</display-name>
     <module>

Modified: trunk/testsuite/src/resources/jmx/loading/ext/application.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/loading/ext/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/jmx/loading/ext/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest ExternalClass sar EAR</display-name>
 </application>

Modified: trunk/testsuite/src/resources/naming/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/naming/ear/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/naming/ear/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
 	<display-name>naming ear test</display-name>
 

Modified: trunk/testsuite/src/resources/perf/application.xml
===================================================================
--- trunk/testsuite/src/resources/perf/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/perf/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" ?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
    <display-name>PerfTest MBean</display-name>
 

Modified: trunk/testsuite/src/resources/testbeancluster/application.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/testbeancluster/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
    <display-name>CIF test ear</display-name>
    <module>

Modified: trunk/testsuite/src/resources/timer/ear/application.xml
===================================================================
--- trunk/testsuite/src/resources/timer/ear/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/timer/ear/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -9,8 +9,8 @@
    </module>
    <module>
       <web>
+         <web-uri>ejb-timer.war</web-uri>
          <context-root>ejb-timer</context-root>
-         <web-uri>ejb-timer.war</web-uri>
       </web>
    </module>
 </application>
\ No newline at end of file

Modified: trunk/testsuite/src/resources/util/scheduler/application.xml
===================================================================
--- trunk/testsuite/src/resources/util/scheduler/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/util/scheduler/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
    <display-name>External schedulable test ear</display-name>
 </application>

Modified: trunk/testsuite/src/resources/web/META-INF/application-bad.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/application-bad.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/web/META-INF/application-bad.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest Web Container Testsuite</display-name>
 

Modified: trunk/testsuite/src/resources/web/META-INF/application-good.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/application-good.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/web/META-INF/application-good.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest Web Container Testsuite</display-name>
 

Modified: trunk/testsuite/src/resources/web/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/web/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest Web Container Testsuite</display-name>
 
     <module>
     <web>
-        <description>A war to deploy to the default context</description>
+        <!-- A war to deploy to the default context -->
         <web-uri>root-web.war</web-uri>
         <context-root>/</context-root>
     </web>
     </module>
     <module>
     <web>
-        <description>The testsuite war</description>
+        <!-- The testsuite war -->
         <web-uri>jbosstest-web.war</web-uri>
         <context-root>/jbosstest</context-root>
     </web>
     </module>
     <module>
     <web>
-        <description>Another war to test context-root matching</description>
+        <!-- Another war to test context-root matching -->
         <web-uri>wars/notjbosstest-web.war</web-uri>
         <context-root>/jbosstest-not</context-root>
     </web>

Modified: trunk/testsuite/src/resources/web/META-INF/application2.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/application2.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/web/META-INF/application2.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest Web Container Testsuite</display-name>
 

Modified: trunk/testsuite/src/resources/web/classpath/application.xml
===================================================================
--- trunk/testsuite/src/resources/web/classpath/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/web/classpath/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
 <application>
     <display-name>JBossTest Web Container Testsuite</display-name>
 
     <module>
        <web>
-           <description>Another war to test manifest classpath</description>
+           <!-- Another war to test manifest classpath -->
            <web-uri>manifest-web.war</web-uri>
            <context-root>/manifest</context-root>
        </web>

Modified: trunk/testsuite/src/resources/web/federation/genericheader/application.xml
===================================================================
--- trunk/testsuite/src/resources/web/federation/genericheader/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/web/federation/genericheader/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -9,6 +9,7 @@
    <module>
       <web>
          <web-uri>header-form-auth.war</web-uri>
+         <context-root>header-form-auth</context-root>
       </web>
    </module>
 

Modified: trunk/testsuite/src/resources/webservice/jbws128/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/webservice/jbws128/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/webservice/jbws128/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -10,11 +10,13 @@
   <module>
     <web>
       <web-uri>ws4ee-jbws128-service.war</web-uri>
+      <context-root>ws4ee-jbws128-service</context-root>
     </web>
   </module>
   <module>
     <web>
       <web-uri>ws4ee-jbws128-client.war</web-uri>
+      <context-root>ws4ee-jbws128-client</context-root>
     </web>
   </module>
 

Modified: trunk/testsuite/src/resources/webservice/ws4eesimple-client/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/webservice/ws4eesimple-client/META-INF/application.xml	2006-11-19 22:15:22 UTC (rev 58638)
+++ trunk/testsuite/src/resources/webservice/ws4eesimple-client/META-INF/application.xml	2006-11-20 11:08:40 UTC (rev 58639)
@@ -10,6 +10,7 @@
   <module>
     <web>
       <web-uri>ws4ee-simple-client.war</web-uri>
+      <context-root>ws4ee-simple-client</context-root>
     </web>
   </module>
   <module>




More information about the jboss-cvs-commits mailing list