bodewig 2004/09/07 01:28:12
Modified: project avalon-excalibur.xml avalon-phoenix.xml
incubator-altrmi.xml jakarta-jmeter.xml
Log:
Adapt to some Avalon changes
Revision Changes Path
1.158 +1 -1 gump/project/avalon-excalibur.xml
Index: avalon-excalibur.xml
===================================================================
RCS file: /home/cvs/gump/project/avalon-excalibur.xml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- avalon-excalibur.xml 23 Aug 2004 23:25:52 -0000 1.157
+++ avalon-excalibur.xml 7 Sep 2004 08:28:11 -0000 1.158
@@ -559,7 +559,7 @@
<ant basedir="instrument" target="jar" buildfile="gump-build.xml">
<!-- optional dependencies -->
- <depend property="avalon-framework.jar" project="avalon-framework"
id="combined"/> <!-- FIX ME -->
+ <depend property="avalon-framework.jar"
project="avalon-framework-api"/> <!-- FIX ME -->
<property name="checkstyle.jar" project="checkstyle"
reference="jarpath"/>
<!-- test-time dependencies -->
1.72 +1 -1 gump/project/avalon-phoenix.xml
Index: avalon-phoenix.xml
===================================================================
RCS file: /home/cvs/gump/project/avalon-phoenix.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- avalon-phoenix.xml 23 Aug 2004 17:17:53 -0000 1.71
+++ avalon-phoenix.xml 7 Sep 2004 08:28:11 -0000 1.72
@@ -97,7 +97,7 @@
<jar name="phoenix-punit.jar" id="punit"/>
<license name="LICENSE.txt"/>
- <javadoc nested="target/javadocs" module="avalon"/>
+ <javadoc nested="target/javadocs"/>
<nag from="Gump Integration Build <[EMAIL PROTECTED]>"
to="[EMAIL PROTECTED]"/>
1.29 +2 -1 gump/project/incubator-altrmi.xml
Index: incubator-altrmi.xml
===================================================================
RCS file: /home/cvs/gump/project/incubator-altrmi.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- incubator-altrmi.xml 22 Aug 2004 13:16:36 -0000 1.28
+++ incubator-altrmi.xml 7 Sep 2004 08:28:11 -0000 1.29
@@ -41,7 +41,8 @@
<depend project="logging-log4j"/>
<depend project="commons-attributes" inherit="runtime"/>
<depend project="excalibur-lifecycle-api"/>
- <depend project="avalon-components" />
+ <!-- gone ?
+ <depend project="avalon-components" /-->
<depend project="avalon-phoenix" id="client" />
<depend project="avalon-phoenix" id="metagenerate-2" />
<depend project="commons-betwixt"/>
1.104 +10 -10 gump/project/jakarta-jmeter.xml
Index: jakarta-jmeter.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-jmeter.xml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- jakarta-jmeter.xml 22 Aug 2004 15:17:38 -0000 1.103
+++ jakarta-jmeter.xml 7 Sep 2004 08:28:11 -0000 1.104
@@ -39,7 +39,7 @@
the ones used in build.xml. However, at present the properties are only
used for
creating the list of jars to be exported.
-->
- <depend property="avalon-framework.jar" project="avalon-framework"
id="combined"/>
+ <depend property="avalon-framework.jar" project="avalon-framework-api"/>
<!-- FIXME -->
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
