|
From: Scott M S. <st...@us...> - 2002-08-10 04:23:45
|
User: starksm
Date: 02/08/09 21:23:45
Modified: . Tag: Branch_3_0 build.xml
Log:
Don't move the cts-vxcmp jboss-app.xml descriptors around to build the
versions as this does not work unless a clean build is done.
Revision Changes Path
No revision
No revision
1.106.2.41 +5 -7 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.40
retrieving revision 1.106.2.41
diff -u -r1.106.2.40 -r1.106.2.41
--- build.xml 7 Aug 2002 22:39:35 -0000 1.106.2.40
+++ build.xml 10 Aug 2002 04:23:44 -0000 1.106.2.41
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.40 2002/08/07 22:39:35 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.41 2002/08/10 04:23:44 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -980,6 +980,7 @@
<jar jarfile="${build.lib}/cts-v1cmp.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cts/service/CtsCmpService*.class"/>
+ <include name="org/jboss/test/util/Debug.class"/>
</fileset>
<metainf dir="${build.resources}/cts/cmpv1">
<include name="jboss-service.xml"/>
@@ -1006,11 +1007,9 @@
<include name="cts-v1cmp.jar" />
</fileset>
</ear>
- <move file="${build.resources}/cts/cmpv1/jboss-app-sar.xml"
- tofile="${build.resources}/cts/cmpv1/jboss-app.xml" />
<ear earfile="${build.lib}/cts-v1cmp-sar.ear"
appxml="${build.resources}/cts/cmpv1/application.xml">
- <metainf dir="${build.resources}/cts/cmpv1">
+ <metainf dir="${build.resources}/cts/cmpv1/ear+sar">
<include name="jboss-app.xml" />
</metainf>
<fileset dir="${build.lib}">
@@ -1046,6 +1045,7 @@
<jar jarfile="${build.lib}/cts-v2cmp.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cts/service/CtsCmpService*.class"/>
+ <include name="org/jboss/test/util/Debug.class"/>
</fileset>
<metainf dir="${build.resources}/cts/cmpv2">
<include name="jboss-service.xml"/>
@@ -1072,11 +1072,9 @@
<include name="cts-v2cmp.jar" />
</fileset>
</ear>
- <move file="${build.resources}/cts/cmpv2/jboss-app-sar.xml"
- tofile="${build.resources}/cts/cmpv2/jboss-app.xml" />
<ear earfile="${build.lib}/cts-v2cmp-sar.ear"
appxml="${build.resources}/cts/cmpv2/application.xml">
- <metainf dir="${build.resources}/cts/cmpv2">
+ <metainf dir="${build.resources}/cts/cmpv2/ear+sar">
<include name="jboss-app.xml" />
</metainf>
<fileset dir="${build.lib}">
|