[jboss-cvs] JBossAS SVN: r69492 - in trunk/testsuite: src/resources/web/META-INF and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-01-31 02:09:22 -0500 (Thu, 31 Jan 2008)
New Revision: 69492

Added:
   trunk/testsuite/src/resources/web/META-INF/jboss-structure.xml
Modified:
   trunk/testsuite/imports/sections/web.xml
   trunk/testsuite/src/resources/web/META-INF/application.xml
Log:
Specify the jboss-structure.xml and update the jbosstest-web.ear contents

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2008-01-31 03:28:18 UTC (rev 69491)
+++ trunk/testsuite/imports/sections/web.xml	2008-01-31 07:09:22 UTC (rev 69492)
@@ -212,10 +212,10 @@
          appxml="${build.resources}/web/META-INF/application.xml">
          <metainf dir="${build.resources}/web/META-INF">
             <include name="jboss-app.xml"/>
+            <include name="jboss-structure.xml"/>
          </metainf>
          <fileset dir="${build.lib}">
             <include name="jbosstest-web-ejbs.jar"/>
-            <include name="root-web.war"/>
             <include name="jbosstest-web.war"/>
             <include name="wars/notjbosstest-web.war"/>
             <include name="lib/util.jar"/>

Modified: trunk/testsuite/src/resources/web/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/application.xml	2008-01-31 03:28:18 UTC (rev 69491)
+++ trunk/testsuite/src/resources/web/META-INF/application.xml	2008-01-31 07:09:22 UTC (rev 69492)
@@ -9,13 +9,6 @@
 
     <module>
     <web>
-        <!-- A war to deploy to the default context -->
-        <web-uri>root-web.war</web-uri>
-        <context-root>/</context-root>
-    </web>
-    </module>
-    <module>
-    <web>
         <!-- The testsuite war -->
         <web-uri>jbosstest-web.war</web-uri>
         <context-root>/jbosstest</context-root>

Added: trunk/testsuite/src/resources/web/META-INF/jboss-structure.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/jboss-structure.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/web/META-INF/jboss-structure.xml	2008-01-31 07:09:22 UTC (rev 69492)
@@ -0,0 +1,61 @@
+<structure>
+    <context>
+        <path name=""/>
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name=""/>
+            <path name="lib" suffixes=".jar"/>
+        </classpath>
+    </context>
+    <context>
+        <path name="jbosstest-web.war" />
+        <metaDataPath>
+            <path name="WEB-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name="jbosstest-web.war/WEB-INF/classes"/>
+            <path name="jbosstest-web.war/WEB-INF/lib" suffixes=".jar"/>
+        </classpath>
+    </context>
+    <context>
+        <path name="wars/notjbosstest-web.war" />
+        <metaDataPath>
+            <path name="WEB-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name="wars/notjbosstest-web.war/WEB-INF/classes"/>
+        </classpath>
+    </context>
+    <context>
+        <path name="jbosstest-web-ejbs.jar" />
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name="jbosstest-web-ejbs.jar"/>
+        </classpath>
+    </context>
+    <context>
+        <path name="cts.jar" />
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name="cts.jar"/>
+        </classpath>
+    </context>
+    <context>
+        <path name="websubdir/relative.jar" />
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name="websubdir/relative.jar"/>
+        </classpath>
+    </context>
+    <context>
+        <path name="scripts/security-config-service.xml" />
+    </context>
+</structure>


Property changes on: trunk/testsuite/src/resources/web/META-INF/jboss-structure.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native