Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Scott M S. <st...@us...> - 2002-09-24 15:35:22
|
User: starksm
Date: 02/09/24 08:35:21
Modified: . Tag: Branch_3_2 build.xml
Log:
Update the web integration tests to include the redeploy wars and ears
Revision Changes Path
No revision
No revision
1.165.2.7 +60 -6 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.6
retrieving revision 1.165.2.7
diff -u -r1.165.2.6 -r1.165.2.7
--- build.xml 16 Sep 2002 14:42:02 -0000 1.165.2.6
+++ build.xml 24 Sep 2002 15:35:20 -0000 1.165.2.7
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.6 2002/09/16 14:42:02 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.7 2002/09/24 15:35:20 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2524,8 +2524,9 @@
</war>
<!-- build notjbosstest-web.war -->
- <war warfile="${build.lib}/notjbosstest-web.war"
- webxml="${build.resources}/web/WEB-INF/notjbosstest-web.xml">
+ <mkdir dir="${build.lib}/wars" />
+ <war warfile="${build.lib}/wars/notjbosstest-web.war"
+ webxml="${build.resources}/web/WEB-INF/notjbosstest-web.xml">
<webinf dir="${build.resources}/web/html/other/WEB-INF">
<include name="*"/>
</webinf>
@@ -2542,7 +2543,7 @@
<!-- build jbosstest-web.war -->
<war warfile="${build.lib}/jbosstest-web.war"
- webxml="${build.resources}/web/WEB-INF/jbosstest-web.xml">
+ webxml="${build.resources}/web/WEB-INF/jbosstest-web.xml">
<webinf dir="${build.resources}/web/html/jbosstest/WEB-INF">
<include name="*"/>
</webinf>
@@ -2562,15 +2563,68 @@
</fileset>
</war>
+ <!-- Create a war with a bad web.xml descriptor to test redeployment
+ of a failed war. The good-web.war is the same war with the web.xml
+ descriptor fixed. Both use a context-root of /redeploy
+ -->
+ <war warfile="${build.lib}/bad-web.war"
+ webxml="${build.resources}/web/WEB-INF/bad-web.xml">
+ <webinf dir="${build.resources}/web/html/bad/WEB-INF">
+ <include name="*"/>
+ </webinf>
+ <fileset dir="${build.resources}/web/html/bad">
+ <include name="**/*.html"/>
+ </fileset>
+ </war>
+ <war warfile="${build.lib}/good-web.war"
+ webxml="${build.resources}/web/WEB-INF/good-web.xml">
+ <webinf dir="${build.resources}/web/html/bad/WEB-INF">
+ <include name="*"/>
+ </webinf>
+ <fileset dir="${build.resources}/web/html/bad">
+ <include name="**/*.html"/>
+ </fileset>
+ </war>
+
+
<!-- build jbosstest-web.ear -->
<ear earfile="${build.lib}/jbosstest-web.ear"
- appxml="${build.resources}/web/META-INF/application.xml">
+ appxml="${build.resources}/web/META-INF/application.xml">
+ <metainf dir="${build.resources}/web/META-INF">
+ <include name="jboss-app.xml" />
+ </metainf>
<fileset dir="${build.lib}">
<include name="jbosstest-web-ejbs.jar"/>
<include name="root-web.war"/>
<include name="jbosstest-web.war"/>
- <include name="notjbosstest-web.war"/>
+ <include name="wars/notjbosstest-web.war"/>
<include name="cts.jar"/>
+ </fileset>
+ </ear>
+
+ <!-- Create an ear with the same war as the jbosstest-web.ear to test
+ conflicts with unpackaging ear content
+ -->
+ <ear earfile="${build.lib}/jbosstest-web2.ear"
+ appxml="${build.resources}/web/META-INF/application2.xml">
+ <metainf dir="${build.resources}/web/META-INF">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="wars/notjbosstest-web.war"/>
+ </fileset>
+ </ear>
+
+ <ear earfile="${build.lib}/jbosstest-bad.ear"
+ appxml="${build.resources}/web/META-INF/application-bad.xml">
+ <fileset dir="${build.lib}">
+ <include name="bad-web.war"/>
+ </fileset>
+ </ear>
+ <ear earfile="${build.lib}/jbosstest-good.ear"
+ appxml="${build.resources}/web/META-INF/application-good.xml">
+ <fileset dir="${build.lib}">
+ <include name="good-web.war"/>
</fileset>
</ear>
</target>
|
