[jboss-cvs] JBossAS SVN: r60454 - branches/Branch_4_2/ejb3.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 8 20:37:32 EST 2007
Author: bdecoste
Date: 2007-02-08 20:37:31 -0500 (Thu, 08 Feb 2007)
New Revision: 60454
Modified:
branches/Branch_4_2/ejb3/build-test.xml
Log:
updated servicexmbean
Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml 2007-02-09 01:28:36 UTC (rev 60453)
+++ branches/Branch_4_2/ejb3/build-test.xml 2007-02-09 01:37:31 UTC (rev 60454)
@@ -145,7 +145,6 @@
<path refid="quartz.quartz.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
- <path refid="hsqldb.hsqldb.classpath"/>
</path>
<!-- ======= -->
@@ -340,9 +339,6 @@
failonerror="${javac.fail.onerror}">
<src path="${source.java}"/>
<classpath refid="javac.classpath"/>
- <exclude name="org/jboss/ejb3/test/**/*EmbeddedTest.java"/>
- <exclude name="org/jboss/ejb3/test/appclient/**"/>
- <exclude name="org/jboss/ejb3/test/standalone/**"/>
</javac>
</target>
@@ -593,47 +589,6 @@
</jar>
</target>
- <target name="ear"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/ear-session.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ear/Facade*.class"/>
- </fileset>
- <fileset dir="${resources}/test/ear/ejbref">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/earpu.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ear/LibEntity.class"/>
- </fileset>
- <fileset dir="${resources}/test/ear/earlib">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/ref.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ear/ReferencedEntity.class"/>
- </fileset>
- </jar>
- <ear earfile="${build.lib}/ear-test.ear" appxml="${resources}/test/ear/application.xml">
- <zipfileset dir="${build.lib}">
- <include name="ear-session.jar"/>
- </zipfileset>
- <zipfileset dir="${build.lib}" prefix="lib">
- <include name="ref.jar"/>
- <include name="earpu.jar"/>
- </zipfileset>
- </ear>
-
- </target>
-
<target name="dependency"
description="Builds all jar files."
depends="compile-classes">
@@ -881,29 +836,6 @@
</target>
- <target name="interceptors3"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/interceptors3-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/interceptors3/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/interceptors3">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/jboss.xml"/>
- </fileset>
- </jar>
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test/interceptors3">
- <include name="*.xml"/>
- </fileset>
- </copy>
-
- </target>
-
<target name="clientinterceptor"
description="Builds all jar files."
depends="compile-classes">
@@ -946,22 +878,6 @@
</jar>
</target>
- <target name="pkg"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/pkg-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/pkg/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/entity">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
- </target>
-
<target name="txexceptions"
description="Builds all jar files."
depends="compile-classes">
@@ -1566,15 +1482,8 @@
</fileset>
<fileset dir="${resources}/test/servlet">
<include name="META-INF/jboss-app.xml"/>
- <include name="servlet-security-service.xml"/>
</fileset>
</ear>
-
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test/servlet">
- <include name="servlet-security-service.xml"/>
- </fileset>
- </copy>
</target>
<target name="ejbthree440"
@@ -1706,68 +1615,6 @@
</jar>
</target>
- <target name="ejbthree712"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/ejbthree712.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ejbthree712/*.class"/>
- </fileset>
- <zipfileset dir="${build.resources}/test/ejbthree712" prefix="META-INF" includes="*"/>
- </jar>
- </target>
-
- <target name="ejbthree751"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/ejbthree751-fail.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ejbthree751/fail/*.class"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/ejbthree751-pass.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ejbthree751/pass/*.class"/>
- </fileset>
- </jar>
- </target>
-
- <target name="ejbthree832"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/ejbthree832.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ejbthree832/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/ejbthree832">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
- </target>
-
- <target name="jaxws"
- description="Builds a simple jar."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/jaxws-context.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/jaxws/*.class"/>
- </fileset>
- </jar>
- </target>
-
<target name="wolfc"
description="Builds all jar files."
depends="compile-classes">
@@ -2293,37 +2140,6 @@
</target>
- <target name="mdbtopic"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/mdbtopic-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/mdbtopic/*.class"/>
- <include name="org/jboss/ejb3/test/mdbtopic/unit/*.class"/>
- </fileset>
- <!--
- <fileset dir="${resources}/test/mdb">
- <include name="users.properties"/>
- <include name="roles.properties"/>
- </fileset>
- <fileset dir="${resources}/test/mdb">
- <include name="META-INF/*.xml"/>
- </fileset>
- -->
- </jar>
-
- <!--
- <copy todir="${build.lib}/embeddable/standalone">
- <fileset dir="${build.lib}">
- <include name="mdbtopic-test.jar"/>
- </fileset>
- </copy>
- -->
- </target>
-
<target name="concurrent"
description="Builds all jar files."
depends="compile-classes">
@@ -2416,7 +2232,8 @@
<include name="org/jboss/ejb3/test/stateful/unit/*.class"/>
</fileset>
<fileset dir="${resources}/test/stateful">
- <include name="META-INF/*.xml"/>
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
</fileset>
<fileset dir="${resources}/test/stateful">
<include name="*.xml"/>
@@ -2811,51 +2628,6 @@
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/clusteredentity-classloader-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/persistence.xml"/>
- <!--include name="META-INF/jboss.xml"/-->
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-classloader-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-classloader-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/persistence.xml"/>
- <!--include name="META-INF/jboss.xml"/-->
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-embeddedid-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/embeddedid">
- <include name="META-INF/application.xml"/>
- </fileset>
- </jar>
-
</target>
<target name="clusteredsession"
@@ -2874,16 +2646,16 @@
</jar>
</target>
- <target name="jars" depends="timestampentity, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
- circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440,
- ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree751, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
+ <target name="jars" depends="timestampentity, servicexmbean, arjuna, 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, 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, interceptors3, iiop, clientinterceptor"/>
+ localcall, interceptors, interceptors2, iiop, clientinterceptor"/>
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
@@ -2980,9 +2752,6 @@
<!-- EJBTHREE-485 needs javassist -->
<path refid="javassist.classpath"/>
-
- <!-- For clustered entities -->
- <path refid="hsqldb.hsqldb.classpath"/>
</classpath>
<formatter type="plain" usefile="true"/>
@@ -3167,16 +2936,6 @@
</target>
- <target name="start-stop-jboss" depends="init" description="Start and stop jboss">
-
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
-
- <stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
- </target>
-
-
<target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
<antcall target="test" inheritRefs="true">
<param name="test" value="webservices"/>
@@ -3215,15 +2974,9 @@
<param name="test" value="interceptors2"/>
</antcall>
<antcall target="test" inheritRefs="true">
- <param name="test" value="interceptors3"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
<param name="test" value="interceptors"/>
</antcall>
<antcall target="test" inheritRefs="true">
- <param name="test" value="jaxws"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
<param name="test" value="txexceptions"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -3284,9 +3037,6 @@
<param name="test" value="stateless"/>
</antcall>
<antcall target="test" inheritRefs="true">
- <param name="test" value="container"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
<param name="test" value="circulardependency"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -3361,15 +3111,6 @@
<!--antcall target="test" inheritRefs="true">
<param name="test" value="microbench"/>
</antcall-->
- <antcall target="test" inheritRefs="true">
- <param name="test" value="ejbthree712"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
- <param name="test" value="ejbthree751"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
- <param name="test" value="ejbthree832"/>
- </antcall>
</target>
<target name="entity-tests" depends="init" description="Execute all tests">
@@ -3397,18 +3138,12 @@
<param name="test" value="factory"/>
</antcall>
<antcall target="test" inheritRefs="true">
- <param name="test" value="ear"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
<param name="test" value="factoryxml"/>
</antcall>
<antcall target="test" inheritRefs="true">
<param name="test" value="hbm"/>
</antcall>
<antcall target="test" inheritRefs="true">
- <param name="test" value="pkg"/>
- </antcall>
- <antcall target="test" inheritRefs="true">
<param name="test" value="entityexception"/>
</antcall>
<antcall target="test" inheritRefs="true">
More information about the jboss-cvs-commits
mailing list