User: ejort
Date: 02/03/23 13:11:03
Modified: . build.xml
Log:
JBoss/JBossMX integration. Also includes a fix to the cluster tests and a more
complete ejblink test that currently fails
Revision Changes Path
1.96 +13 -108 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 23 Mar 2002 03:55:08 -0000 1.95
+++ build.xml 23 Mar 2002 21:11:03 -0000 1.96
@@ -13,22 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- [EMAIL PROTECTED] -->
-<!-- TEMPORARY: Until JBossMX is stable the tests are run over JMXRI -->
-<!-- But for the JBossMX tests to compile we have to build -->
-<!-- over jboss-jmx.jar and those tests need to run over -->
-<!-- that jar. -->
-<!-- CHANGES: The classpaths have changed as follows. -->
-<!-- most.classpath contains all jars except the jmx implementation -->
-<!-- javac.classpath adds jboss-jmx.jar for compilation -->
-<!-- tests.classpath adds jmxri.jar for running the main tests -->
-<!-- tests.jbossmx.classpath adds jboss-jmx.jar for running JBossMX tests-->
-<!-- NOTE: If somebody can think of a cleaner way of doing this -->
-<!-- please feel free to fix it. But the test -->
-<!-- tests-jmxri-compliance still needs to run over jmxri.jar -->
-<!-- the aim of that test is to check our compliance suite. -->
-
-<!-- $Id: build.xml,v 1.95 2002/03/23 03:55:08 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.96 2002/03/23 21:11:03 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -92,13 +77,6 @@
<pathelement path="${sun.jndi.lib}/jndi.jar"/>
</path>
- <!-- Java Management Extensions (JMX) -->
- <property name="sun.jmx.root" value="${project.thirdparty}/sun/jmx"/>
- <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
- <path id="sun.jmx.classpath">
- <pathelement path="${sun.jmx.lib}/jmxri.jar"/>
- </path>
-
<!-- Java API for XML Processing (JAXP) -->
<property name="sun.jaxp.root" value="${project.thirdparty}/sun/jaxp"/>
<property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
@@ -185,8 +163,6 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jndi.classpath"/>
-<!-- See comment at start -->
-<!-- <path refid="sun.jmx.classpath"/> -->
<path refid="sun.jaxp.classpath"/>
<path refid="sun.jaas.classpath"/>
<path refid="sun.jce.classpath"/>
@@ -348,41 +324,20 @@
<property name="classpath" value=""/>
<property name="local.classpath" value=""/>
- <!-- Class minus JMX implementation see comment at start -->
- <path id="most.classpath">
+ <!-- Classpath to build and run the tests -->
+ <path id="tests.classpath">
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/junit.jar"/>
<pathelement path="${project.tools}/lib/optional.jar"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- The classpath required to build classes. -->
- <!-- Used for building see comment at start -->
- <path id="javac.classpath">
- <path refid="most.classpath"/>
<path refid="jboss.jmx.classpath"/>
- </path>
-
- <!-- The classpath required to run tests classes. -->
- <!-- Run over JMXRI see comment at start -->
- <path id="tests.classpath">
- <path refid="most.classpath"/>
- <path refid="sun.jmx.classpath"/>
- </path>
-
- <!-- The classpath required to run tests for JBossMX classes. -->
- <!-- Run over JBossMX see comment at start -->
- <path id="tests.jbossmx.classpath">
- <path refid="most.classpath"/>
- <path refid="jboss.jmx.classpath"/>
- <pathelement path="${jboss.server.lib}/jboss.jar"/>
+ <path refid="thirdparty.classpath"/>
</path>
<!-- The classpath required to build javadocs. -->
<path id="javadoc.classpath">
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</path>
<!-- Packages to include when generating api documentation -->
@@ -404,7 +359,7 @@
<!-- xdoclet -->
<path id="xdoclet.task.classpath">
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
<pathelement location="${project.tools}/lib/xdoclet.jar"/>
<pathelement location="${project.tools}/lib/ant.jar"/>
</path>
@@ -629,7 +584,7 @@
failonerror="${javac.fail.onerror}">
<src path="${source.java}"/>
<src path="${build.gen-src}"/>
- <classpath refid="javac.classpath"/>
+ <classpath refid="tests.classpath"/>
<include name="${javac.includes}"/>
<exclude name="${javac.excludes}"/>
</javac>
@@ -1378,6 +1333,7 @@
<!-- naming test -->
<target name="_jars-naming">
<mkdir dir="${build.lib}"/>
+ <mkdir dir="${build.lib}/subdir"/>
<!-- build naming.jar -->
<jar jarfile="${build.lib}/naming.jar">
@@ -1404,7 +1360,7 @@
</jar>
<!-- build naminga.jar -->
- <jar jarfile="${build.lib}/naminga.jar">
+ <jar jarfile="${build.lib}/subdir/naminga.jar">
<fileset dir="${build.classes}">
<patternset refid="common.test.application.classes"/>
<include name="org/jboss/test/naming/ejb/**"/>
@@ -1430,7 +1386,7 @@
<!-- build naming.ear -->
<jar jarfile="${build.lib}/naming.ear">
<fileset dir="${build.lib}">
- <include name="naminga.jar"/>
+ <include name="subdir/naminga.jar"/>
<include name="namingb.jar"/>
</fileset>
<fileset dir="${build.resources}/naming/ear">
@@ -1655,6 +1611,7 @@
<patternset refid="common.test.application.classes"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
+ <include name="org/jboss/test/testbeancluster/bean/**"/>
<include name="org/somepackage/**"/>
</fileset>
<fileset dir="${build.resources}/testbeancluster">
@@ -2294,16 +2251,6 @@
tests-jbossmx-performance,
tests-report">
</target>
-
- <!--
- | Helper to run the jmx compliance tests over JBossMX and jmxri
- | There is no point generating reports, the second test overwrites the
- | first report.
- -->
- <target name="tests-jmx-compliance" description="Execute all jmx compliance
tests."
- depends="init,
- tests-jmxri-compliance,
- tests-jbossmx-compliance"/>
<!--
| Standard tests that should run successfully against a default JBoss
@@ -2815,7 +2762,7 @@
<classpath>
<pathelement location="${build.classes}"/>
- <path refid="tests.jbossmx.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -2856,7 +2803,7 @@
<classpath>
<pathelement location="${build.classes}"/>
- <path refid="tests.jbossmx.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -2897,48 +2844,6 @@
<classpath>
<pathelement location="${build.classes}"/>
- <path refid="tests.jbossmx.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="**/jbossmx/compliance/**/*TestCase.class"/>
- <!-- Ignore the abstract class -->
- <exclude name="org/jboss/test/jbossmx/compliance/TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <!--
- | JMXRI compliance tests that *might* run correctly.
- -->
-
- <target name="tests-jmxri-compliance" depends="jars">
- <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="log4j.properties"
file="${build.resources}/log4j.properties"/>
-
- <classpath>
- <pathelement location="${build.classes}"/>
- <path refid="sun.jmx.classpath"/>
<path refid="tests.classpath"/>
</classpath>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
