[Jboss-cvs] JBossAS SVN: r56624 - branches/Branch_4_0/ejb3
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 7 22:28:50 EDT 2006
Author: bill.burke at jboss.com
Date: 2006-09-07 22:28:49 -0400 (Thu, 07 Sep 2006)
New Revision: 56624
Modified:
branches/Branch_4_0/ejb3/build-test.xml
branches/Branch_4_0/ejb3/build.xml
Log:
Modified: branches/Branch_4_0/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_0/ejb3/build-test.xml 2006-09-08 02:27:32 UTC (rev 56623)
+++ branches/Branch_4_0/ejb3/build-test.xml 2006-09-08 02:28:49 UTC (rev 56624)
@@ -67,6 +67,7 @@
<import file="../testsuite/imports/server-config.xml"/>
<!-- Propagate the dist directory as a jbosstest system property -->
<property name="ejb3.dist" value="${jboss.dist}-ejb3"/>
+ <echo message="${ejb3.dist}"/>
<property name="jbosstest.dist" value="${ejb3.dist}"/>
<macrodef name="wait-on-host">
@@ -139,8 +140,8 @@
<path refid="sun.javamail.classpath"/>
<path refid="jboss.serialization.classpath"/>
<path refid="jboss.jbossws.classpath"/>
+ <path refid="quartz.quartz.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
- <path refid="quartz.quartz.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
</path>
@@ -201,6 +202,7 @@
<property name="build.testlog" value="${module.output}/log"/>
<property name="build.classes" value="${module.output}/test-classes"/>
<property name="build.lib" value="${module.output}/test-lib"/>
+ <property name="build.ejb3.lib" value="${module.output}/lib"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
<property name="build.stylesheets" value="${module.output}/stylesheets"/>
@@ -228,6 +230,7 @@
<!-- The classpath required to build classes. -->
<path id="javac.classpath">
<pathelement path="${classpath}"/>
+ <!--pathelement path="${resources}/test/seam/jboss-seam.jar"/-->
<pathelement path="${local.classpath}"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -261,12 +264,17 @@
<!-- This test accesses some ejb3 classes directly -->
<path refid="jboss.ejb3.classpath"/>
</path>
-
+
<path id="dd.web.client.classpath">
<path refid="client.classpath"/>
<path refid="apache.httpclient.classpath"/>
</path>
+ <path id="iiop.client.classpath">
+ <pathelement path="${resources}/test/iiop"/>
+ <path refid="client.classpath"/>
+ </path>
+
<!-- The classpath required to build javadocs. -->
<path id="javadoc.classpath">
<path refid="javac.classpath"/>
@@ -408,15 +416,28 @@
<jar jarfile="${build.lib}/quartzmdb.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/jca/inflowmdb/Quartz*.class"/>
+ <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
</fileset>
</jar>
<jar jarfile="${build.lib}/jcainflowmdb.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/jca/inflowmdb/Test*.class"/>
+ <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
</fileset>
</jar>
+ <jar jarfile="${build.lib}/jmsinflowmdb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/jca/inflowmdb/JMS*.class"/>
+ <include name="org/jboss/ejb3/test/jca/inflowmdb/Stateless*.class"/>
+ <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/test/jca/inflow">
+ <include name="jmsmdbtest-service.xml"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.lib}/jcainflowmdb_dd.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTest*.class"/>
@@ -427,15 +448,27 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/jcainflow.rar">
+ <jar jarfile="${build.lib}/jcainflow.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/jca/inflow/*.class"/>
</fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/jcainflow.rar">
+ <fileset dir="${build.lib}">
+ <include name="jcainflow.jar"/>
+ </fileset>
<fileset dir="${resources}/test/jca/inflow">
<include name="META-INF/ra.xml"/>
</fileset>
</jar>
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/jca/inflow">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
</target>
<target name="cache"
@@ -455,8 +488,8 @@
<jar jarfile="${build.lib}/cache-test.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/cache/Stateful*.class"/>
- <include name="org/jboss/ejb3/test/cache/SimpleStateful*.class"/>
+ <include name="org/jboss/ejb3/test/cache/**/*.class"/>
+ <exclude name="org/jboss/ejb3/test/cache/unit/*"/>
</fileset>
</jar>
@@ -721,7 +754,7 @@
<include name="org/jboss/ejb3/test/webservices/*.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/jsr181.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/webservices/jsr181/EJB3*.class"/>
@@ -731,7 +764,7 @@
<include name="META-INF/ejb-jar.xml"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/jsr181-client.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.class"/>
@@ -813,7 +846,7 @@
</fileset>
</jar>
</target>
-
+
<target name="timerdependency"
description="Builds all jar files."
depends="compile-classes">
@@ -990,7 +1023,7 @@
</fileset>
<fileset dir="${resources}/test/bank">
<include name="META-INF/*.xml"/>
- <include name="*.xml"/>
+ <include name="bank-ejb3-interceptors-aop.xml"/>
<include name="users.properties"/>
<include name="roles.properties"/>
</fileset>
@@ -1031,6 +1064,24 @@
</jar>
</target>
+ <target name="unauthenticatedprincipal"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/unauthenticatedprincipal.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/unauthenticatedprincipal/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/unauthenticatedprincipal">
+ <include name="META-INF/*.xml"/>
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="reference21_30"
description="Builds all jar files."
depends="compile-classes">
@@ -1110,7 +1161,7 @@
<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-
+
<ear earfile="${build.lib}/multideploy.ear"
appxml="${build.resources}/test/reference21_30/META-INF/application.xml">
<fileset dir="${build.lib}">
@@ -1277,6 +1328,9 @@
<include name="**/*.jsp"/>
<include name="**/*.html"/>
</fileset>
+ <fileset dir="${source.java}/org/jboss/ejb3/test/dd/web/jsp">
+ <include name="*.jsp"/>
+ </fileset>
</war>
<ear earfile="${build.lib}/dd-web.ear"
@@ -1293,7 +1347,7 @@
</fileset>
</ear>
</target>
-
+
<target name="jsp"
description="Builds all jar files."
depends="compile-classes">
@@ -1321,7 +1375,7 @@
</fileset>
</ear>
</target>
-
+
<target name="classloader"
description="Builds all jar files."
depends="compile-classes">
@@ -1338,7 +1392,7 @@
<include name="*.properties"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/classloader-shared.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/classloader/Shared*.class"/>
@@ -1348,7 +1402,7 @@
<include name="META-INF/jboss.xml"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/classloader-unshared.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/classloader/Unshared*.class"/>
@@ -1356,6 +1410,29 @@
</fileset>
</jar>
</target>
+
+ <target name="clusteredservice"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/clusteredservice.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredservice/*.class"/>
+ <exclude name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
+ </fileset>
+ </jar>
+
+ <war warfile="${build.lib}/clusteredservice.war"
+ webxml="${build.resources}/test/clusteredservice/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredservice/servlets/*.class"/>
+ <include name="org/jboss/ejb3/test/clusteredservice/ServiceRemote.class"/>
+ <include name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
+ </classes>
+ </war>
+ </target>
<target name="servlet"
description="Builds all jar files."
@@ -1369,10 +1446,11 @@
<exclude name="org/jboss/ejb3/test/servlet/War*.class"/>
</fileset>
<fileset dir="${resources}/test/servlet">
+ <include name="*.properties"/>
<include name="META-INF/jboss.xml"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/servlet-client.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/servlet/War*.class"/>
@@ -1405,7 +1483,7 @@
</fileset>
</ear>
</target>
-
+
<target name="ejbthree440"
description="Builds all jar files."
depends="compile-classes">
@@ -1483,6 +1561,71 @@
</ear>
</target>
+ <target name="ejbthree485"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ejbthree485.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/regression/ejbthree485/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="ejbthree620"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ejbthree620.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/regression/ejbthree620/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="ejbthree653"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ejbthree653.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/regression/ejbthree653/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="ejbthree670"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ejbthree670.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/regression/ejbthree670/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="wolfc"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/wolfc.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/wolfc/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="scopedclassloader"
description="Builds all jar files."
depends="compile-classes">
@@ -1661,6 +1804,14 @@
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
+ <jar jarfile="${build.lib}/regression-ejbthree625-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/regression/ejbthree625/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/regression/ejbthree625">
+ <include name="META-INF/ejb-jar.xml"/>
+ </fileset>
+ </jar>
<jar jarfile="${build.lib}/regression-ejbthree231.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/regression/ejbthree231/*.class"/>
@@ -1696,6 +1847,9 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/strictpool/*.class"/>
</fileset>
+ <fileset dir="${resources}/test/strictpool">
+ <include name="META-INF/*.xml"/>
+ </fileset>
</jar>
<copy todir="${build.lib}">
<fileset dir="${resources}/test/strictpool">
@@ -1740,6 +1894,9 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/ssladvanced/*.class"/>
</fileset>
+ <fileset dir="${resources}/test/ssladvanced">
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
</jar>
</target>
@@ -1758,6 +1915,39 @@
</fileset>
</jar>
</target>
+
+ <target name="mdbtransactions"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/mdbtransactions-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/mdbtransactions/*.class"/>
+ <exclude name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/mdbtransactions">
+ <include name="META-INF/persistence.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/mdbtransactions21-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/mdbtransactions">
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
+ </jar>
+
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/mdbtransactions">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+ </target>
<target name="longlived"
description="Builds all jar files."
@@ -1896,6 +2086,7 @@
<jar jarfile="${build.lib}/mdb-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdb/*.class"/>
+ <include name="org/jboss/ejb3/test/mdb/unit/*.class"/>
</fileset>
<fileset dir="${resources}/test/mdb">
<include name="users.properties"/>
@@ -1905,13 +2096,28 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/mdb">
<include name="*.xml"/>
</fileset>
</copy>
+
</target>
+ <target name="concurrent"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/concurrent.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/concurrent/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="consumer"
description="Builds all jar files."
depends="compile-classes">
@@ -1964,6 +2170,20 @@
</fileset>
</jar>
</target>
+
+ <!--target name="concurrent"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/concurrent-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/concurrent/**/*.class"/>
+ <include name="org/jboss/ejb3/test/concurrent/unit/*.class"/>
+ </fileset>
+ </jar>
+ </target-->
<target name="stateful"
description="Builds all jar files."
@@ -1973,10 +2193,12 @@
<jar jarfile="${build.lib}/stateful-test.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/stateful/*.class"/>
+ <include name="org/jboss/ejb3/test/stateful/**/*.class"/>
+ <include name="org/jboss/ejb3/test/stateful/unit/*.class"/>
</fileset>
<fileset dir="${resources}/test/stateful">
<include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
</fileset>
<fileset dir="${resources}/test/stateful">
<include name="*.xml"/>
@@ -1985,6 +2207,23 @@
</jar>
</target>
+ <!--target name="seam"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/seam-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/seam/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/seam">
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="seam.properties"/>
+ </fileset>
+ </jar>
+ </target-->
+
<target name="aspectdomain"
description="Builds all jar files."
depends="compile-classes">
@@ -2001,7 +2240,7 @@
</fileset>
</jar>
</target>
-
+
<target name="ejbcontext"
description="Builds all jar files."
depends="compile-classes">
@@ -2018,6 +2257,23 @@
</jar>
</target>
+ <target name="iiop"
+ description="Builds iiop.jar."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/iiop.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/iiop/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test">
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="security"
description="Builds all jar files."
depends="compile-classes">
@@ -2050,7 +2306,7 @@
<include name="META-INF/jaas-test-config.xml"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/security-extensions.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/security/Unauthenticated*.class"/>
@@ -2094,6 +2350,19 @@
</jar>
</target>
+ <target name="invoker"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/invoker-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/invoker/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="circulardependency"
description="Builds all jar files."
depends="compile-classes">
@@ -2109,7 +2378,7 @@
</fileset>
</jar>
</target>
-
+
<target name="servicedependency"
description="Builds all jar files."
depends="compile-classes">
@@ -2122,7 +2391,7 @@
</fileset>
</jar>
</target>
-
+
<target name="stateless14"
description="Builds all jar files."
depends="compile-classes">
@@ -2134,13 +2403,13 @@
<include name="org/jboss/ejb3/test/stateless14/*.class"/>
</fileset>
</jar>
-
+
<delete>
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/stateless14/**/*.class"/>
</fileset>
</delete>
-
+
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
debug="${javac.debug}"
@@ -2178,11 +2447,6 @@
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test-configs/ejb3-jacc/deploy">
- <include name="jacc-service.xml"/>
- </fileset>
- </copy>
</target>
<!--
@@ -2327,10 +2591,18 @@
</fileset>
</jar>
</target>
+
+ <target name="jars" depends="mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
+ circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ejbthree440,
+ ejbthree454, ejbthree653, ejbthree670, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
+ securitydomain, enventry,
+ jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions,
+ exception, dd/override, stateless, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275,
+ entityexception, asynchronous, consumer, clusteredentity, secondary, stateful, service, lob, cache, initial,
+ timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
+ composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
+ localcall, interceptors, interceptors2, iiop, clientinterceptor"/>
-
- <target name="jars" depends="classloader, circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ejbthree440, ejbthree454, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, securitydomain, enventry, jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions, exception, dd/override, stateless, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275, entityexception, asynchronous, consumer, clusteredentity, secondary, stateful, service, lob,cache,initial,timer,benchmark,entity,joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression, composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc, localcall, interceptors, interceptors2, clientinterceptor"/>
-
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
<!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
@@ -2358,12 +2630,21 @@
<condition property="client.run.classpath" value="dd.classpath">
<equals arg1="${test}" arg2="dd"/>
</condition>
+ <condition property="client.run.classpath" value="iiop.client.classpath">
+ <equals arg1="${test}" arg2="iiop"/>
+ </condition>
<condition property="client.run.classpath" value="client.classpath">
<not>
<isset property="client.run.classpath"/>
</not>
</condition>
+ <condition property="test.jndi.url" value="${node0.jndi.url}">
+ <not>
+ <isset property="test.jndi.url"/>
+ </not>
+ </condition>
+
<junit dir="${module.output}"
printsummary="yes"
haltonerror="false"
@@ -2387,24 +2668,41 @@
<sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
<sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.naming.provider.url" value="${test.jndi.url}"/>
<jvmarg line="${jvmargs}" />
<classpath>
+ <path refid="hibernate.hibernate.classpath"/>
<pathelement location="${build.classes}"/>
+ <path refid="${client.run.classpath}"/>
<pathelement location="${resources}/test"/>
- <path refid="${client.run.classpath}"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="sun.jaf.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="apache.httpclient.classpath"/>
+ <path refid="jboss.server.classpath"/>
+ <path refid="jboss.naming.classpath"/>
+ <path refid="trove.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aspects.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <!-- for Corba -->
+ <path refid="jboss.iiop.classpath"/>
+ <path refid="jacorb.jacorb.classpath"/>
+ <path refid="apache.avalon.classpath"/>
+ <path refid="apache.avalon.logkit.classpath"/>
+
+ <!-- EJBTHREE-485 needs javassist -->
+ <path refid="javassist.classpath"/>
</classpath>
<formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <formatter type="xml" usefile="true" unless="test.extension"/>
+ <formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
<batchtest todir="${build.reports}"
haltonerror="false"
@@ -2463,6 +2761,8 @@
<jvmarg line="${jvmargs}" />
<classpath>
+ <path refid="asm.asm.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
<pathelement location="${build.classes}"/>
<pathelement location="${resources}/test"/>
<path refid="${client.run.classpath}"/>
@@ -2482,7 +2782,7 @@
description="Execute all tests for Java1.4 client compatibility.">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
-
+
<junit dir="${module.output}"
printsummary="yes"
haltonerror="false"
@@ -2539,8 +2839,8 @@
</java>
</target>
+
-
<target name="run" depends="init" if="class"
description="Execute all tests in the given test directory.">
<java fork="true" classname="${class}">
@@ -2559,11 +2859,14 @@
<antcall target="ssl-advanced-test" inheritRefs="true"/>
<antcall target="jacc-test" inheritRefs="true"/>
<antcall target="clustered-tests" inheritRefs="true"/>
+ <antcall target="invoker-test" inheritRefs="true"/>
+ <antcall target="iiop-tests" inheritRefs="true"/>
</target>
<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
+ <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
</target>
<target name="ejb-tests" depends="init" description="Execute all tests">
@@ -2586,6 +2889,9 @@
<param name="test" value="regression/ejbthree454"/>
</antcall>
<antcall target="test" inheritRefs="true">
+ <param name="test" value="regression/ejbthree670"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="regression/salesforce7123"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -2627,6 +2933,12 @@
<antcall target="test" inheritRefs="true">
<param name="test" value="stateful"/>
</antcall>
+ <!--antcall target="test" inheritRefs="true">
+ <param name="test" value="concurrent"/>
+ </antcall-->
+ <!--antcall target="test" inheritRefs="true">
+ <param name="test" value="seam"/>
+ </antcall-->
<antcall target="test" inheritRefs="true">
<param name="test" value="aspectdomain"/>
</antcall>
@@ -2652,6 +2964,9 @@
<param name="test" value="mdb"/>
</antcall>
<antcall target="test" inheritRefs="true">
+ <param name="test" value="mdbtransactions"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="consumer"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -2685,6 +3000,9 @@
<param name="test" value="mail"/>
</antcall>
<antcall target="test" inheritRefs="true">
+ <param name="test" value="unauthenticatedprincipal"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="securitydomain"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -2815,8 +3133,22 @@
</target>
+ <target name="clustered-test" depends="init">
+ <antcall target="tests-clustering-startup"/>
+ <antcall target="tests-clustering-wait"/>
- <target name="clustered-one-test" depends="init, clusteredsession">
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="jvmargs" value=""/>
+ <!--
+ <param name="jvmargs"
+ value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=/dt_socket,address=8787,server=n,suspend=n"/>
+ -->
+ </antcall>
+
+ <antcall target="tests-clustering-shutdown"/>
+ </target>
+
+ <target name="clustered-one-test" depends="init, clusteredsession, clusteredentity">
<!--
-->
<antcall target="tests-clustering-startup"/>
@@ -2842,13 +3174,11 @@
</target>
-
<target name="clustered-tests" depends="init, clusteredsession, clusteredentity">
<antcall target="tests-clustering-startup"/>
<antcall target="tests-clustering-wait"/>
<antcall target="test-clustered-entity"/>
-
<antcall target="test-cluster-session"/>
<!--
@@ -2856,7 +3186,7 @@
anyway as part of the tests, so simplest is to shut down the other from within
the test rather than figure out what to shut down here.
-->
- <antcall target="tests-clustering-shutdown" />
+ <antcall target="tests-clustering-shutdown"/>
</target>
@@ -2915,6 +3245,33 @@
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="ejb3-ssl-advanced"/>
</target>
+
+ <target name="invoker-test" depends="init">
+ <create-config baseconf="all" newconf="invoker" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ </patternset>
+ </create-config>
+
+ <start-jboss conf="invoker" host="${node0}" jboss.dist="${ejb3.dist}"/>
+ <wait-on-host/>
+
+ <property name="jvmargs" value=""/>
+
+ <!--antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="invoker"/>
+ <param name="jvmargs" value="${jvmargs}"/>
+ </antcall-->
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="invoker"/>
+ </antcall>
+
+ <stop-jboss jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="invoker"/>
+ </target>
<target name="jacc-test" depends="init">
<create-config baseconf="all" newconf="ejb3-jacc" jboss.dist="${ejb3.dist}">
@@ -2924,12 +3281,12 @@
<include name="lib/**"/>
</patternset>
</create-config>
- <start-jboss conf="ejb3-jacc" host="${node0}" jboss.dist="${ejb3.dist}"/>
+ <start-jboss conf="ejb3-jacc" host="${node0}"/>
<wait-on-host/>
<antcall target="test" inheritRefs="true">
<param name="test" value="jacc"/>
</antcall>
- <stop-jboss jboss.dist="${ejb3.dist}"/>
+ <stop-jboss/>
<wait-on-shutdown conf="ejb3-jacc"/>
</target>
@@ -2951,6 +3308,10 @@
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="clusteredsession"/>
<param name="jvmargs" value=""/>
+ <!--
+ <param name="jvmargs"
+ value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=n,suspend=n"/>
+ -->
</antcall>
</target>
@@ -2989,7 +3350,7 @@
<antcall target="modify-ejb3-repl_sync">
<param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
</antcall>
- </sequential>
+ </sequential>
</macrodef>
<target name="modify-ejb3-repl_sync">
@@ -3044,6 +3405,7 @@
/>
</junitreport>
</target>
+
<target name="tests-report-text" depends="tests-report-html">
<mkdir dir="${build.reports}/text"/>
@@ -3069,8 +3431,63 @@
</style>
</target>
+
<target name="tests-report-clean">
<delete dir="${build.reports}"/>
</target>
+ <target name="jacorb-test" depends="init" if="test"
+ description="Execute all tests in the given test directory using JacORB.">
+ <!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
+ <property name="debugFlags" value=""/>
+ <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="${test}"/>
+ <param name="test.extension" value="jacorb"/>
+ <param name="test.jndi.url" value="corbaloc::localhost:3528/JBoss/Naming/root"/>
+ <!-- using jacorb -->
+ <param name="jvmargs" value="${debugFlags}
+ -Djava.security.manager
+ -Djava.security.policy=${resources}/security/tst.policy
+ -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
+ -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
+ -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer
+ -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer
+ -DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root
+ -Djacorb.log.default.verbosity=10
+ -Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory" />
+ </antcall>
+ </target>
+
+ <target name="sunorb-test" depends="init" if="test"
+ description="Execute all tests in the given test directory using Sun ORB.">
+ <!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
+ <property name="debugFlags" value=""/>
+ <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="${test}"/>
+ <param name="test.extension" value="sunorb"/>
+ <!-- using sun jdk -->
+ <param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/>
+ </antcall>
+ </target>
+
+ <target name="iiop-tests" depends="init" description="Execute all tests">
+
+ <start-jboss conf="all" host="${node0}"/>
+ <wait-on-host/>
+
+ <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
+
+ <stop-jboss/>
+ <wait-on-shutdown conf="all"/>
+ </target>
+
+ <target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
+ <antcall target="jacorb-test" inheritRefs="true">
+ <param name="test" value="iiop"/>
+ </antcall>
+ <!-- TODO: call sunorb-test, but the report gets overwritten -->
+ </target>
+
</project>
Modified: branches/Branch_4_0/ejb3/build.xml
===================================================================
--- branches/Branch_4_0/ejb3/build.xml 2006-09-08 02:27:32 UTC (rev 56623)
+++ branches/Branch_4_0/ejb3/build.xml 2006-09-08 02:28:49 UTC (rev 56624)
@@ -91,6 +91,7 @@
<path refid="xdoclet.xdoclet.classpath"/>
<path refid="apache.ant.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="quartz.quartz.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="apache.logging.classpath"/>
@@ -98,6 +99,7 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
+ <path refid="jacorb.jacorb.classpath"/>
</path>
<!-- ======= -->
@@ -122,6 +124,7 @@
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.iiop.classpath"/>
</path>
<!-- ===== -->
@@ -311,9 +314,9 @@
<!-- build client-jar -->
<jar jarfile="${build.lib}/jboss-ejb3-client.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/annotation/ejb/*.class"/>
<include name="org/jboss/ejb3/EJB3Util.class"/>
<include name="org/jboss/ejb3/Ejb3Registry.class"/>
+ <include name="org/jboss/ejb3/InitialContextFactory.class"/>
<include name="org/jboss/ejb3/asynchronous/*"/>
<include name="org/jboss/ejb3/interceptor/ClientInterceptorUtil.class"/>
<include name="org/jboss/ejb3/mdb/ConsumerManager.class"/>
@@ -323,11 +326,20 @@
<include name="org/jboss/ejb3/stateful/StatefulRemoteInvocation.class"/>
<include name="org/jboss/ejb3/ProxyUtils.class"/>
<include name="org/jboss/ejb3/**/*Proxy.class"/>
- <exclude name="org/jboss/ejb3/**/*LocalProxy.class"/>
+ <!--exclude name="org/jboss/ejb3/**/*LocalProxy.class"/-->
<include name="org/jboss/ejb3/**/*HandleImpl.class"/>
<include name="org/jboss/ejb3/Container.class"/>
<include name="org/jboss/ejb3/*ProxyFactory.class"/>
<include name="org/jboss/ejb3/proxy/**/*.class"/>
+ <include name="org/jboss/ejb3/*ServiceServer*.class"/>
+ <include name="org/jboss/ejb3/*KernelAbstraction*.class"/>
+
+ <!-- EJBTHREE-485: include java assist proxy stuff -->
+ <include name="org/jboss/ejb3/stateless/Javassist*.class"/>
+
+ <!-- EJBTHREE-667: include object factory -->
+ <include name="org/jboss/ejb3/naming/client/**/*.class"/>
+ <include name="org/jboss/ejb3/naming/BrainlessContext.class"/>
</fileset>
</jar>
More information about the jboss-cvs-commits
mailing list