Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Scott M S. <st...@us...> - 2002-05-27 17:33:51
|
User: starksm
Date: 02/05/27 10:00:34
Modified: . Tag: Branch_3_0 build.xml
Log:
Add failed war/ear redeployment tests to the web integration suite
Revision Changes Path
No revision
No revision
1.106.2.17 +94 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.16
retrieving revision 1.106.2.17
diff -u -r1.106.2.16 -r1.106.2.17
--- build.xml 26 May 2002 20:48:11 -0000 1.106.2.16
+++ build.xml 27 May 2002 17:00:31 -0000 1.106.2.17
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.16 2002/05/26 20:48:11 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.17 2002/05/27 17:00:31 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -745,7 +745,9 @@
_jars-ejbconf,
_jars-proxycompiler,
_jars-helloiiop,
- _jars-bankiiop">
+ _jars-bankiiop,
+ _jars-classloader"
+ >
</target>
<!--
@@ -1912,7 +1914,8 @@
</war>
<!-- build notjbosstest-web.war -->
- <war warfile="${build.lib}/notjbosstest-web.war"
+ <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="*"/>
@@ -1950,6 +1953,29 @@
</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">
@@ -1960,10 +1986,36 @@
<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="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>
<!-- bench test -->
@@ -2268,6 +2320,44 @@
</jar>
</target>
+
+ <!-- classloader test
+ <target name="_jars-classloader" depends="compile-classes-only">
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/c0.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass0*.class"/>
+ <jar jarfile="${build.lib}/c1.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass1*.class"/>
+ <jar jarfile="${build.lib}/c2.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass2*.class"/>
+ <jar jarfile="${build.lib}/c3.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass3*.class"/>
+ <jar jarfile="${build.lib}/c4.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass4*.class"/>
+ <jar jarfile="${build.lib}/c5.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass5*.class"/>
+ <jar jarfile="${build.lib}/c6.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass6*.class"/>
+ <jar jarfile="${build.lib}/c7.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass7*.class"/>
+ <jar jarfile="${build.lib}/c8.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass8*.class"/>
+ <jar jarfile="${build.lib}/c9.jar" basedir="${build.classes}"
+ includes="org/jboss/test/classloader/concurrentload/Anyclass9*.class"/>
+ <jar jarfile="${build.lib}/classloader.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/concurrentload/ConcurrentLoader*.class"/>
+ </fileset>
+ <fileset dir="${build.lib}">
+ <include name="c?.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/classloader/concurrentloader">
+ <include name="**"/>
+ </fileset>
+ </jar>
+ </target>
+-->
<!-- ================================================================== -->
<!-- Documents -->
|
