[jboss-cvs] JBossAS SVN: r74521 - trunk/testsuite/imports/sections.

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

Author: jeff.zhang
Date: 2008-06-13 03:18:06 -0400 (Fri, 13 Jun 2008)
New Revision: 74521

Modified:
   trunk/testsuite/imports/sections/web.xml
Log:
[JBAS-5626] fix ClasspathUnitTestCase.testLibServlet

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2008-06-13 06:56:49 UTC (rev 74520)
+++ trunk/testsuite/imports/sections/web.xml	2008-06-13 07:18:06 UTC (rev 74521)
@@ -74,34 +74,6 @@
          </fileset>
       </jar>
 
-      <!-- Build manifest-web.war -->
-      <manifest file="${build.resources}/manifest-web.mf">
-         <attribute name="Class-Path" value="jbosstest-web-util.jar"/>
-      </manifest>
-      <war warfile="${build.lib}/manifest-web.war"
-         manifest="${build.resources}/manifest-web.mf"
-         webxml="${build.resources}/web/WEB-INF/manifest-web.xml">
-         <fileset dir="${build.resources}/web/html/manifest">
-            <include name="**/*.jsp"/>
-         </fileset>
-      	<classes dir="${build.classes}">
-            <include name="org/jboss/test/web/servlets/ClasspathServlet2.class"/>
-            <include name="org/jboss/test/util/Debug.class"/>
-      	</classes>
-         <lib dir="${build.lib}">
-            <include name="jbosstest-web-libservlet.jar"/>
-            <include name="resources.jar"/>
-         </lib>
-      </war>
-      <ear earfile="${build.lib}/manifest-web.ear"
-         appxml="${build.resources}/web/META-INF/application-mf.xml">
-         <fileset dir="${build.lib}">
-            <include name="manifest-web.war"/>
-            <include name="jbosstest-web-util.jar"/>
-            <include name="jbosstest-web-util2.jar"/>
-         </fileset>
-      </ear>
-
       <!-- build root-web.war -->
       <war warfile="${build.lib}/root-web.war"
          webxml="${build.resources}/web/WEB-INF/root-web.xml">
@@ -134,11 +106,40 @@
          </fileset>
       </jar>
 
-      <!-- build jbosstest-web.war -->
       <jar destfile="${build.lib}/resources.jar">
          <zipfileset dir="${build.resources}/web/html/jbosstest"
             prefix="org/jboss/resources" includes="JBoss.properties"/>
       </jar>
+
+      <!-- Build manifest-web.war -->
+      <manifest file="${build.resources}/manifest-web.mf">
+         <attribute name="Class-Path" value="jbosstest-web-util.jar"/>
+      </manifest>
+      <war warfile="${build.lib}/manifest-web.war"
+         manifest="${build.resources}/manifest-web.mf"
+         webxml="${build.resources}/web/WEB-INF/manifest-web.xml">
+         <fileset dir="${build.resources}/web/html/manifest">
+            <include name="**/*.jsp"/>
+         </fileset>
+      	<classes dir="${build.classes}">
+            <include name="org/jboss/test/web/servlets/ClasspathServlet2.class"/>
+            <include name="org/jboss/test/util/Debug.class"/>
+      	</classes>
+         <lib dir="${build.lib}">
+            <include name="jbosstest-web-libservlet.jar"/>
+            <include name="resources.jar"/>
+         </lib>
+      </war>
+      <ear earfile="${build.lib}/manifest-web.ear"
+         appxml="${build.resources}/web/META-INF/application-mf.xml">
+         <fileset dir="${build.lib}">
+            <include name="manifest-web.war"/>
+            <include name="jbosstest-web-util.jar"/>
+            <include name="jbosstest-web-util2.jar"/>
+         </fileset>
+      </ear>
+
+      <!-- build jbosstest-web.war -->
       <war warfile="${build.lib}/jbosstest-web.war"
          webxml="${build.resources}/web/WEB-INF/jbosstest-web.xml">
          <webinf dir="${build.resources}/web/WEB-INF">