|
From: Andreas S. <sch...@us...> - 2002-05-23 18:24:26
|
User: schaefera
Date: 02/05/23 11:24:26
Modified: . build.xml
Log:
Added a test case for the Foe-Deployer creating a WL application, deploys
it on the JBoss server and checks if it finally got deployed as JBoss
application. If necessary it will deploy the foe-deployer first (if not
already done) because it is an optinal service.
Revision Changes Path
1.132 +132 -24 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build.xml 23 May 2002 17:20:19 -0000 1.131
+++ build.xml 23 May 2002 18:24:26 -0000 1.132
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.131 2002/05/23 17:20:19 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.132 2002/05/23 18:24:26 schaefera Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -646,6 +646,39 @@
destdir="${build.resources}/banknew/META-INF"
mergedir="${source.resources}/banknew/"/>
</xdoclet>
+
+ <!-- Foe-Deployer: Simple Test -->
+ <mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
+ <xdoclet destdir="${build.gen-src}"
+ classpath="${xdoclet.task.classpath}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jca/ejb"-->
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/foedeployer/ejb/simple/*Bean.java"/>
+ </fileset>
+ <packageSubstitution packages="simple" substituteWith="interfaces"/>
+ <!-- <dataobject/> -->
+ <!-- <valueobject/> -->
+ <remoteinterface/>
+ <localinterface/>
+ <homeinterface/>
+ <localhomeinterface/>
+ <entitypk/>
+ <!-- <entitycmp/> -->
+ <!-- <entitybmp/> -->
+ <!-- <utilobject/> -->
+ <!-- <session/> -->
+ <deploymentdescriptor xmlencoding ="UTF-8"
+ destdir="${build.resources}/foedeployer/simple/META-INF"/>
+ <weblogic version="6.1"
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/foedeployer/simple/META-INF"
+ validatexml="true"
+ datasource="xdoclet.samples"
+ mergedir="${source.resources}/foedeployer/"/>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
+ </xdoclet>
</target>
<target name="compile-mbean-sources" depends="init">
@@ -806,6 +839,7 @@
_jars-security,
_jars-cmp2,
_jars-jsr77,
+ _jars-foedeployer,
_jars-jbossmx,
_jars-ejbconf,
_jars-proxycompiler,
@@ -2223,7 +2257,7 @@
<target name="_jars-jsr77">
<mkdir dir="${build.lib}"/>
- <!-- build ejbconf-test.jar -->
+ <!-- build jsr77-test.jar -->
<jar jarfile="${build.lib}/jsr77-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/management/**"/>
@@ -2231,6 +2265,30 @@
</jar>
</target>
+ <!-- foe-deployer test -->
+ <target name="_jars-foedeployer">
+ <mkdir dir="${build.lib}"/>
+ <!-- First task is to copy the Foe-Deployer SAR to the current lib directory -->
+ <echo>${project.root}</echo>
+ <copy todir="${build.lib}" filtering="no">
+ <fileset dir="${project.root}/varia/output/lib">
+ <include name="foe-deployer.sar"/>
+ </fileset>
+ </copy>
+ <!-- build foe-deployer-test.wlar -->
+ <jar jarfile="${build.lib}/foe-deployer-test.wlar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/foedeployer/ejb/**"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/foedeployer/interfaces/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/foedeployer/simple/">
+ <include name="META-INF/**"/>
+ </fileset>
+ </jar>
+ </target>
+
<!-- cmp2 tests -->
<target name="_jars-cmp2">
<mkdir dir="${build.lib}"/>
@@ -2968,12 +3026,12 @@
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
@@ -2981,7 +3039,7 @@
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Dsecurity.domain=test-domain"/>
<sysproperty key="java.security.policy"
- value="${build.resources}/security/tst.policy"/>
+ value="${build.resources}/security/tst.policy"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2995,12 +3053,12 @@
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ extension=".xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
<include name="**/test/management/test/**UnitTestCase.class"/>
@@ -3018,12 +3076,12 @@
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${marathon.timeout}"
- jvm="${junit.jvm}">
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${marathon.timeout}"
+ jvm="${junit.jvm}">
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
@@ -3031,7 +3089,7 @@
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Dsecurity.domain=test-domain"/>
<sysproperty key="java.security.policy"
- value="${build.resources}/security/tst.policy"/>
+ value="${build.resources}/security/tst.policy"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -3049,15 +3107,65 @@
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ extension=".xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
<include name="**/test/marathon/test/**MarathonTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ | Standard Foe-Deployer tests that should run successfully against a default
+ | JBoss server distribution build.
+ -->
+
+ <target name="tests-foe-deployer-unit" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Dsecurity.domain=test-domain"/>
+ <sysproperty key="java.security.policy"
+ value="${build.resources}/security/tst.policy"/>
+ <sysproperty key="java.security.auth.login.config"
+ value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}/security"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="**/test/foedeployer/test/**TestCase.class"/>
</fileset>
</batchtest>
</junit>
|