Attached diff includes changes to runtime/index and the gump output to
refect test project dependencies used in the composition impl package.
Steve.
Index: runtime/merlin/unit/etc/test/merlin.properties
===================================================================
--- runtime/merlin/unit/etc/test/merlin.properties (revision 46227)
+++ runtime/merlin/unit/etc/test/merlin.properties (working copy)
@@ -1,4 +1,8 @@
+<<<<<<< .mine
+avalon.repository.online = false
+=======
avalon.repository.online = true
+>>>>>>> .r46222
#----------------------------------------------------------------------
# static defaults for the merlin platform
Index: runtime/index.xml
===================================================================
--- runtime/index.xml (revision 46227)
+++ runtime/index.xml (working copy)
@@ -702,6 +702,9 @@
<include key="avalon-util-extension-impl"/>
<include key="avalon-util-lifecycle"/>
<include key="avalon-logging-impl" build="false" test="true"/>
+ <include key="avalon-test-testa" build="false" runtime="false" test="false"/>
+ <include key="avalon-test-testb" build="false" runtime="false" test="false"/>
+ <include key="avalon-test-testc" build="false" runtime="false" test="false"/>
<include key="avalon-test-dynamics" build="false" runtime="false" test="false"/>
<include key="avalon-test-includes" build="false" runtime="false" test="true"/>
<include key="avalon-test-testcyclic" build="false" runtime="false"
test="false"/>
Index: central/system/gump/avalon-trunk.xml
===================================================================
--- central/system/gump/avalon-trunk.xml (revision 46227)
+++ central/system/gump/avalon-trunk.xml (working copy)
@@ -166,12 +166,12 @@
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
<depend project="avalon-logging-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -484,6 +484,27 @@
<depend property="gump.resource.junit" project="junit"/>
<depend property="gump.resource.ant-junit" project="ant" id="junit"/>
<depend property="gump.resource.ant-nodeps" project="ant" id="nodeps"/>
+ <depend property="gump.resource.checkstyle" project="checkstyle">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.antlr" project="antlr">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.bcel" project="bcel">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-beanutils-core"
project="commons-beanutils-core">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-collections"
project="commons-collections">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-logging" project="commons-logging"
id="commons-logging">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.regexp" project="regexp">
+ <noclasspath/>
+ </depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
@@ -516,12 +537,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -1284,12 +1305,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -1424,6 +1445,27 @@
<depend property="gump.resource.junit" project="junit"/>
<depend property="gump.resource.ant-junit" project="ant" id="junit"/>
<depend property="gump.resource.ant-nodeps" project="ant" id="nodeps"/>
+ <depend property="gump.resource.checkstyle" project="checkstyle">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.antlr" project="antlr">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.bcel" project="bcel">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-beanutils-core"
project="commons-beanutils-core">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-collections"
project="commons-collections">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-logging" project="commons-logging"
id="commons-logging">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.regexp" project="regexp">
+ <noclasspath/>
+ </depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
@@ -2316,12 +2358,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -2441,12 +2483,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -2999,12 +3041,12 @@
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
<depend project="avalon-util-lifecycle"><noclasspath/></depend>
<depend project="avalon-logging-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -3833,6 +3875,27 @@
<depend property="gump.resource.junit" project="junit"/>
<depend property="gump.resource.ant-junit" project="ant" id="junit"/>
<depend property="gump.resource.ant-nodeps" project="ant" id="nodeps"/>
+ <depend property="gump.resource.checkstyle" project="checkstyle">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.antlr" project="antlr">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.bcel" project="bcel">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-beanutils-core"
project="commons-beanutils-core">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-collections"
project="commons-collections">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.commons-logging" project="commons-logging"
id="commons-logging">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.regexp" project="regexp">
+ <noclasspath/>
+ </depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
@@ -4012,12 +4075,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-meta-spi"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -4186,12 +4249,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -4907,12 +4970,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
@@ -5404,12 +5467,12 @@
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-util-configuration"><noclasspath/></depend>
<depend project="avalon-util-extension-impl"><noclasspath/></depend>
+ <depend project="avalon-test-testa"><noclasspath/></depend>
+ <depend project="avalon-test-testb"><noclasspath/></depend>
+ <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-dynamics"><noclasspath/></depend>
<depend project="avalon-test-includes"><noclasspath/></depend>
<depend project="avalon-test-playground"><noclasspath/></depend>
- <depend project="avalon-test-testa"><noclasspath/></depend>
- <depend project="avalon-test-testb"><noclasspath/></depend>
- <depend project="avalon-test-testc"><noclasspath/></depend>
<depend project="avalon-test-testd"><noclasspath/></depend>
<depend project="avalon-test-teste"><noclasspath/></depend>
<depend project="avalon-test-testcyclic"><noclasspath/></depend>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
