User: user57
Date: 01/08/02 17:06:42
Modified: etc Tag: jboss_buildmagic build-bank.xml
Log:
o working on getting the bank test to run again.
Revision Changes Path
No revision
No revision
1.1.2.8 +52 -68 jbosstest/etc/Attic/build-bank.xml
Index: build-bank.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/etc/Attic/build-bank.xml,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- build-bank.xml 2001/08/02 23:12:58 1.1.2.7
+++ build-bank.xml 2001/08/03 00:06:42 1.1.2.8
@@ -9,61 +9,30 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build-bank.xml,v 1.1.2.7 2001/08/02 23:12:58 user57 Exp $ -->
+<!-- $Id: build-bank.xml,v 1.1.2.8 2001/08/03 00:06:42 user57 Exp $ -->
<project default="main">
+ <!-- =================================================================== -->
+ <!-- Test Setup -->
+ <!-- =================================================================== -->
+
+ <property name="test.name" value="bank"/>
+ <property name="test.Name" value="Bank Test"/>
+
<!--
- | Setup paths that have been published as properties by our parent.
+ | Setup the test environemnet with values passed from our parent
+ | build file.
-->
<path id="javac.classpath">
<pathelement path="${testsuite.module.javac.classpath}"/>
</path>
- <path id="apache.ant.classpath">
- <pathelement path="${testsuite.module.apache.ant.classpath}"/>
- </path>
-
- <path id="apache.ant.ext.classpath">
- <pathelement path="${testsuite.module.apache.ant.classpath}"/>
- </path>
-
- <!--
- | Setup the test properties and patternsets used to generate jars.
- -->
-
- <property name="test.name" value="bank"/>
- <property name="test.path" value="org/jboss/test/bank"/>
- <property name="test.package" value="org.jboss.test.bank"/>
-
- <property name="test.client.jar"
- value="${build.jars}/${test.name}test.jar"/>
- <patternset id="test.client.classes">
- <include name="org/jboss/test/util/**"/>
- <include name="${test.path}/interfaces/**"/>
- <include name="${test.path}/test/**"/>
- </patternset>
- <patternset id="test.client.resources">
- <include name="*.*"/>
- </patternset>
-
- <property name="test.application.jar"
- value="${build.jars}/${test.name}.jar"/>
- <patternset id="test.application.classes">
- <include name="org/jboss/test/util/ejb/**"/>
- <include name="${test.path}/interfaces/**"/>
- <include name="${test.path}/ejb/**"/>
- </patternset>
- <patternset id="test.application.resources">
- <include name="**/*.xml"/>
- </patternset>
-
<path id="test.classpath">
- <pathelement location="${test.client.jar}"/>
<path refid="javac.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="apache.ant.ext.classpath"/>
+ <pathelement path="${testsuite.module.apache.ant.classpath}"/>
+ <pathelement path="${testsuite.module.apache.ant.classpath}"/>
</path>
@@ -90,7 +59,9 @@
failonerror="${javac.fail.onerror}">
<src path="${source.java}"/>
<classpath refid="javac.classpath"/>
- <include name="${test.path}/**"/>
+
+ <include name="org/jboss/test/util/**"/>
+ <include name="org/jboss/test/bank/**"/>
</javac>
</target>
@@ -102,24 +73,35 @@
<target name="jars" depends="compile">
<mkdir dir="${build.jars}"/>
- <!-- build the test application jar -->
- <jar jarfile="${test.application.jar}">
+ <!-- build the client jar -->
+ <jar jarfile="${build.jars}/banktest.jar"
+ manifest="${build.etc}/manifest.mf">
+
+ <!-- include classes -->
<fileset dir="${build.classes}">
- <patternset refid="test.application.classes"/>
+ <include name="org/jboss/test/util/**"/>
+ <include name="org/jboss/test/bank/interfaces/**"/>
+ <include name="org/jboss/test/bank/test/**"/>
</fileset>
- <fileset dir="${build.resources}/${test.name}">
- <patternset refid="test.application.resources"/>
+
+ <!-- include resources -->
+ <fileset dir="${build.resources}/bank">
+ <include name="*.*"/>
</fileset>
</jar>
- <!-- build the test client jar -->
- <jar jarfile="${test.client.jar}"
- manifest="${build.etc}/manifest.mf">
+ <!-- build the application jar -->
+ <jar jarfile="${build.jars}/bank.jar">
+ <!-- include classes -->
<fileset dir="${build.classes}">
- <patternset refid="test.client.classes"/>
+ <include name="org/jboss/test/util/ejb/**"/>
+ <include name="org/jboss/test/bank/interfaces/**"/>
+ <include name="org/jboss/test/bank/ejb/**"/>
</fileset>
- <fileset dir="${build.resources}/${test.name}">
- <patternset refid="test.client.resources"/>
+
+ <!-- include resources -->
+ <fileset dir="${build.resources}/bank">
+ <include name="**/*.xml"/>
</fileset>
</jar>
</target>
@@ -133,6 +115,7 @@
<target name="tests-junit" depends="jars">
<mkdir dir="${build.reports}"/>
+
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
haltonerror="${junit.haltonerror}"
@@ -144,20 +127,20 @@
<!-- junit.jvm.options must have a valid value -->
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.jars}"/>
- <classpath refid="test.classpath"/>
+ <classpath>
+ <pathelement location="${build.jars}/banktest.jar"/>
+ <path refid="test.classpath"/>
+ <pathelement path="${build.classes}"/>
+ </classpath>
<formatter type="${junit.formatter.type}"
usefile="${junit.formatter.usefile}"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
+ <batchtest todir="${build.reports}">
<fileset dir="${build.classes}">
- <include name="${test.path}/**/Test*.class"/>
- <include name="${test.path}/**/AllJUnitTests.class"/>
- <include name="${test.path}/**/Main.class"/>
+ <include name="org/jboss/test/bank/test/**/Test*.class"/>
+ <include name="org/jboss/test/bank/test/**/AllJUnitTests.class"/>
+ <include name="org/jboss/test/bank/test/**/Main.class"/>
</fileset>
</batchtest>
</junit>
@@ -171,15 +154,16 @@
<!-- Clean up all build output -->
<target name="clean"
description="Cleans up most generated files.">
- <delete dir="${build.classes}/${test.path}"/>
- <delete dir="${build.resources}/${test.name}"/>
- <delete dir="${test.application.jar}"/>
- <delete dir="${test.client.jar}"/>
+ <delete dir="${build.classes}/org/jboss/test/bank"/>
+ <delete dir="${build.resources}/bank"/>
+ <delete dir="${build.jars}/banktest.jar"/>
+ <delete dir="${build.jars}/bank.jar"/>
</target>
<!-- Clean up all generated files -->
<target name="clobber" depends="clean"
description="Cleans up all generated files.">
+ <delete dir="${build.classes}/org/jboss/test/util"/>
</target>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
