[jboss-cvs] JBossAS SVN: r79078 - in trunk/testsuite: src/resources/deployers/jbas5349/dummywar/WEB-INF and 1 other directory.

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

Author: istudens at redhat.com
Date: 2008-10-03 08:38:24 -0400 (Fri, 03 Oct 2008)
New Revision: 79078

Removed:
   trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml
Modified:
   trunk/testsuite/imports/sections/deployers.xml
   trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml
Log:
correct structure of the war

Modified: trunk/testsuite/imports/sections/deployers.xml
===================================================================
--- trunk/testsuite/imports/sections/deployers.xml	2008-10-03 12:15:56 UTC (rev 79077)
+++ trunk/testsuite/imports/sections/deployers.xml	2008-10-03 12:38:24 UTC (rev 79078)
@@ -187,14 +187,11 @@
            <include name="org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.class"/>
         </fileset>
       </jar>
-      <jar destfile="${build.lib}/bootstrapdependencies-web.war">
-         <fileset dir="${build.resources}/deployers/jbas5349/dummywar">
-            <include name="**/*"/>
-         </fileset>
-        <fileset dir="${build.classes}">
+      <war destfile="${build.lib}/bootstrapdependencies-web.war" webxml="${build.resources}/deployers/jbas5349/dummywar/WEB-INF/web.xml">
+        <classes dir="${build.classes}">
            <include name="org/jboss/test/deployers/jbas5349/servlet/DummyServlet.class"/>
-        </fileset>
-      </jar>
+        </classes>
+      </war>
 
       <!-- JBAS-2904 SAR -->
 	  <jar destfile="${build.lib}/Atestdeployerorder-jbas2904.sar">

Deleted: trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml	2008-10-03 12:15:56 UTC (rev 79077)
+++ trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml	2008-10-03 12:38:24 UTC (rev 79078)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web
-    PUBLIC "-//JBoss//DTD Web Application 2.4//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-    <context-root>/dummywar</context-root>
-</jboss-web>

Modified: trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml	2008-10-03 12:15:56 UTC (rev 79077)
+++ trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml	2008-10-03 12:38:24 UTC (rev 79078)
@@ -5,7 +5,7 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
                              http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
 >
-   <display-name>dummyweb</display-name>
+   <display-name>dummywar</display-name>
    
    <servlet>
       <servlet-name>DummyServlet</servlet-name>