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

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

Author: scott.stark at jboss.org
Date: 2007-03-26 21:03:40 -0400 (Mon, 26 Mar 2007)
New Revision: 61723

Added:
   trunk/testsuite/src/resources/web/META-INF/application-mf.xml
   trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml
Modified:
   trunk/testsuite/imports/sections/web.xml
Log:
Update the manifest-web.ear

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2007-03-27 00:35:48 UTC (rev 61722)
+++ trunk/testsuite/imports/sections/web.xml	2007-03-27 01:03:40 UTC (rev 61723)
@@ -34,8 +34,8 @@
             <include name="roles.properties"/>
          </fileset>
       </jar>
-
-      <!-- build jbosstest-web-util.jar -->
+      
+      <!-- build jbosstest-web-util2.jar -->
       <jar destfile="${build.lib}/jbosstest-web-util2.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/test/web/util2/**"/>
@@ -79,30 +79,18 @@
       </manifest>
       <war warfile="${build.lib}/manifest-web.war"
          manifest="${build.resources}/manifest-web.mf"
-         webxml="${build.resources}/web/classpath/web.xml">
-         <classes dir="${build.classes}">
-            <include name="org/jboss/test/web/servlets/ClasspathServlet.class"/>
-            <include name="org/jboss/test/web/util/ClassInClasses.class"/>
-         </classes>
-         <lib dir="${build.lib}">
-            <include name="jbosstest-web-libservlet.jar"/>
-            <include name="jbosstest-web-util.jar"/>
-         </lib>
+         webxml="${build.resources}/web/WEB-INF/manifest-web.xml">
          <fileset dir="${build.resources}/web/html/manifest">
             <include name="**/*.jsp"/>
          </fileset>
-         <zipfileset dir="${build.resources}/web/html/jbosstest"
-            prefix="org/jboss/resources" includes="JBoss.properties"/>
       </war>
       <ear earfile="${build.lib}/manifest-web.ear"
-         appxml="${build.resources}/web/classpath/application.xml">
+         appxml="${build.resources}/web/META-INF/application-mf.xml">
          <fileset dir="${build.lib}">
             <include name="manifest-web.war"/>
-            <include name="lib/util.jar"/>
+            <include name="jbosstest-web-util.jar"/>
+            <include name="jbosstest-web-util2.jar"/>
          </fileset>
-         <zipfileset dir="${build.lib}" prefix="lib">
-            <include name="jbosstest-web-util2.jar"/>            
-         </zipfileset>
       </ear>
 
       <!-- build root-web.war -->

Added: trunk/testsuite/src/resources/web/META-INF/application-mf.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/application-mf.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/web/META-INF/application-mf.xml	2007-03-27 01:03:40 UTC (rev 61723)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+    <display-name>JBossTest Web Container Testsuite</display-name>
+    
+    <module>
+        <web>
+            <description>Another war to test manifest classpath</description>
+            <web-uri>manifest-web.war</web-uri>
+            <context-root>/manifest</context-root>
+        </web>
+    </module>
+    
+</application>


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

Added: trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml
===================================================================
--- trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml	2007-03-27 01:03:40 UTC (rev 61723)
@@ -0,0 +1,8 @@
+<?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>
+   <description>A war that references classes via a manifest Class-Path</description>
+</web-app>


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