User: user57
Date: 01/08/02 17:06:41
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o working on getting the bank test to run again.
Revision Changes Path
No revision
No revision
1.1.2.16 +21 -7 jbosstest/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/Attic/build.xml,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- build.xml 2001/08/02 23:18:01 1.1.2.15
+++ build.xml 2001/08/03 00:06:41 1.1.2.16
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.15 2001/08/02 23:18:01 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.16 2001/08/03 00:06:41 user57 Exp $ -->
<project default="main">
@@ -243,6 +243,8 @@
failonerror="${javac.fail.onerror}">
<src path="${source.java}"/>
<classpath refid="javac.classpath"/>
+
+ <!-- Only compile the test utilities -->
<include name="org/jboss/test/util/**"/>
</javac>
</target>
@@ -356,7 +358,9 @@
<execmodules modules="${tests}"
target="compile"
root="${module.root}/etc"
- antfile="build-${module}.xml"
+ antfile="build-${testmodule}.xml"
+ moduleproperty="testmodule"
+ targetproperty="testtarget"
skipmissing="${testsuite.executemodules.skipmissing}">
<header message="${testsuite.executemodules.header}"/>
<footer message="${testsuite.executemodules.footer}"/>
@@ -368,7 +372,9 @@
<execmodules modules="${tests}"
target="jars"
root="${module.root}/etc"
- antfile="build-${module}.xml"
+ antfile="build-${testmodule}.xml"
+ moduleproperty="testmodule"
+ targetproperty="testtarget"
skipmissing="${testsuite.executemodules.skipmissing}">
<header message="${testsuite.executemodules.header}"/>
<footer message="${testsuite.executemodules.footer}"/>
@@ -380,7 +386,9 @@
<execmodules modules="${tests}"
target="main"
root="${module.root}/etc"
- antfile="build-${module}.xml"
+ antfile="build-${testmodule}.xml"
+ moduleproperty="testmodule"
+ targetproperty="testtarget"
skipmissing="${testsuite.executemodules.skipmissing}">
<header message="${testsuite.executemodules.header}"/>
<footer message="${testsuite.executemodules.footer}"/>
@@ -392,7 +400,9 @@
<execmodules modules="${tests}"
target="tests"
root="${module.root}/etc"
- antfile="build-${module}.xml"
+ antfile="build-${testmodule}.xml"
+ moduleproperty="testmodule"
+ targetproperty="testtarget"
skipmissing="${testsuite.executemodules.skipmissing}">
<header message="${testsuite.executemodules.header}"/>
<footer message="${testsuite.executemodules.footer}"/>
@@ -404,7 +414,9 @@
<execmodules modules="${tests}"
target="clean"
root="${module.root}/etc"
- antfile="build-${module}.xml"
+ antfile="build-${testmodule}.xml"
+ moduleproperty="testmodule"
+ targetproperty="testtarget"
skipmissing="${testsuite.executemodules.skipmissing}">
<header message="${testsuite.executemodules.header}"/>
<footer message="${testsuite.executemodules.footer}"/>
@@ -416,7 +428,9 @@
<execmodules modules="${tests}"
target="clobber"
root="${module.root}/etc"
- antfile="build-${module}.xml"
+ antfile="build-${testmodule}.xml"
+ moduleproperty="testmodule"
+ targetproperty="testtarget"
skipmissing="${testsuite.executemodules.skipmissing}">
<header message="${testsuite.executemodules.header}"/>
<footer message="${testsuite.executemodules.footer}"/>
1.1.2.13 +6 -15 jbosstest/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/Attic/config.xml,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- config.xml 2001/08/02 23:18:01 1.1.2.12
+++ config.xml 2001/08/03 00:06:41 1.1.2.13
@@ -7,7 +7,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.12 2001/08/02 23:18:01 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.13 2001/08/03 00:06:41 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -168,22 +168,15 @@
<property name="jboss.server.root" value="${project.root}/server/output"/>
<property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
<path id="jboss.server.classpath">
- <pathelement path="${jboss.server.lib}/jboss.jar"/>
+ <pathelement path="${jboss.server.lib}/deploy.jar"/>
+ <pathelement path="${jboss.server.lib}/connector.jar"/>
<pathelement path="${jboss.server.lib}/jboss-client.jar"/>
</path>
- <!-- Connector -->
- <property name="jboss.connector.root" value="${project.root}/connector/output"/>
- <property name="jboss.connector.lib" value="${jboss.connector.root}/lib"/>
- <path id="jboss.connector.classpath">
- <pathelement path="${jboss.connector.lib}/jbosscx.jar"/>
- </path>
-
<!-- Security -->
<property name="jboss.security.root" value="${project.root}/security/output"/>
<property name="jboss.security.lib" value="${jboss.security.root}/lib"/>
<path id="jboss.security.classpath">
- <pathelement path="${jboss.security.lib}/jbosssx.jar"/>
<pathelement path="${jboss.security.lib}/jbosssx-client.jar"/>
<pathelement path="${jboss.security.lib}/jboss-jaas.jar"/>
</path>
@@ -192,7 +185,6 @@
<property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
<property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
<path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
<pathelement path="${jboss.messaging.lib}/jbossmq-client.jar"/>
</path>
@@ -201,7 +193,6 @@
<path refid="jboss.j2ee.classpath"/>
<path refid="jboss.naming.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.connector.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.messaging.classpath"/>
</path>
@@ -308,12 +299,12 @@
<!-- Define the header and footer displayed during each module execution -->
<property name="testsuite.executemodules.header"><![CDATA[
======================================================================
- == Executing ${target} in module '${module}'...
+ == Executing ${testtarget} in module '${testmodule}'...
==]]></property>
<property name="testsuite.executemodules.footer"><![CDATA[
==
- == Finished with ${target} in module '${module}'.
+ == Finished with ${testtarget} in module '${testmodule}'.
======================================================================
]]></property>
@@ -321,7 +312,7 @@
<property name="testgroups" value="default"/>
<target name="module-configuration-setup">
- <moduleconfig property="testmodules" selected="${testgroups}">
+ <moduleconfig property="tests" selected="${testgroups}">
<!-- Modules -->
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development