leif 2002/08/06 09:28:17
Modified: . build.xml dependencies.txt
Log:
Merge the ICM into the ECM.
Revision Changes Path
1.176 +4 -10 jakarta-avalon-excalibur/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- build.xml 5 Aug 2002 07:34:37 -0000 1.175
+++ build.xml 6 Aug 2002 16:28:17 -0000 1.176
@@ -20,7 +20,6 @@
<ant dir="altrmi" target="dist"/>
<ant dir="collections" target="dist"/>
<ant dir="concurrent" target="dist"/>
- <ant dir="instrument" target="dist"/>
<ant dir="logger" target="dist"/>
<ant dir="threadcontext" target="dist"/>
<ant dir="sourceresolve" target="dist"/>
@@ -28,10 +27,11 @@
<ant dir="store" target="dist"/>
<!-- Sub projects with dependencies. -->
+ <ant dir="instrument" target="dist"/> <!-- altrmi -->
<ant dir="pool" target="dist"/> <!-- collections,
concurrent, instrument -->
<ant dir="thread" target="dist"/> <!-- lang, instrument,
threadcontext, pool -->
<ant dir="component" target="dist"/> <!-- collections,
logger, instrument, pool -->
- <ant dir="xmlbundle" target="dist"/> <!-- component, store
-->
+ <ant dir="xmlbundle" target="dist"/> <!-- instrument,
component, store -->
<ant dir="util" target="dist"/> <!-- component -->
<ant dir="testcase" target="dist"/> <!-- logger, component
-->
<ant dir="event" target="dist"/> <!-- collections,
concurrent, lang, pool, thread, util, event -->
@@ -167,12 +167,6 @@
<ant dir="event" target="dist-jar"/>
<ant dir="fortress" target="dist-jar"/>
- <!--
- To work around circular dependencies, we need to call this build a
second time.
- Otherwise the optional classes will not be built.
- -->
- <ant dir="instrument" target="dist-jar"/>
-
<!-- Jump through hoops to avoid jlink size bug. -->
<property name="tmpjarA" value="avalon-excalibur-tmpA.jar"/>
@@ -237,7 +231,6 @@
<ant dir="altrmi" target="jar"/>
<ant dir="collections" target="jar"/>
<ant dir="concurrent" target="jar"/>
- <ant dir="instrument" target="jar"/>
<ant dir="logger" target="jar"/>
<ant dir="threadcontext" target="jar"/>
<ant dir="sourceresolve" target="jar"/>
@@ -245,11 +238,12 @@
<ant dir="store" target="jar"/>
<!-- Sub projects with dependencies. -->
+ <ant dir="instrument" target="jar"/> <!-- altrmi -->
<ant dir="pool" target="jar"/> <!-- collections,
concurrent, instrument, sourceresolve -->
<ant dir="datasource" target="jar"/> <!-- pool -->
<ant dir="thread" target="jar"/> <!-- lang, instrument,
threadcontext, pool -->
<ant dir="component" target="jar"/> <!-- collections,
logger, instrument, pool -->
- <ant dir="xmlbundle" target="jar"/> <!-- component, store
-->
+ <ant dir="xmlbundle" target="jar"/> <!-- instrument,
component, store -->
<ant dir="util" target="jar"/> <!-- component -->
<ant dir="testcase" target="jar"/> <!-- logger, component
-->
<ant dir="event" target="jar"/> <!-- collections,
concurrent, lang, pool, thread, util, event -->
1.29 +3 -3 jakarta-avalon-excalibur/dependencies.txt
Index: dependencies.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/dependencies.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dependencies.txt 29 Jul 2002 21:21:03 -0000 1.28
+++ dependencies.txt 6 Aug 2002 16:28:17 -0000 1.29
@@ -13,7 +13,7 @@
* context -> framework
* extension -> .
* i18n -> .
-* instrument -> framework, alt-rmi-client-impl, altrmi-client-interfaces,
altrmi-common, altrmi-generator, altrmi-manager-interfaces, logkit, logger,
collections, altrmi-server-impl, altrmi-server-interfaces, component, pool
+* instrument -> framework, altrmi-*
* io -> .
* threadcontext -> .
* naming -> .
@@ -27,7 +27,7 @@
* datasource -> pool, logkit, framework [Unit tests: junit, testcase,
component, logger, collections, concurrent]
* event -> collections, concurrent, core, framework, event, util, thread,
threadcontext, pool
* all -> framework, component, logkit, logger, xmlbundle, i18n,
sourceresolve [Unit tests: junit, testcase]
-* component -> logkit, framework, collections, logger, pool [Unit tests:
junit, util, testcase, instrument (runtime)]
+* component -> instrument, logkit, framework, collections, logger, pool
[Unit tests: junit, util, testcase]
* fortress -> instrument, framework, event (recursive on mpool in
scratchpad), component (test class), logger, util [Unit tests: junit, testcase,
pool, datasource, cache, monitor, xmlbundle]
* logger -> logkit, framework. [Unit tests: junit, testcase, component,
collections, pool]
* thread -> pool, instrument, threadcontext, logkit, framework
@@ -35,5 +35,5 @@
* testcase -> framework, component, logkit, logger
* monitor -> framework, logkit, logger, sourceresolve [Unit tests: junit,
testcase]
* merlin -> context, configuration, framework, logkit
-* xmlbundle -> xmlutil, framework, logger, logkit, component, pool,
sourceresolve, store
+* xmlbundle -> instrument, xmlutil, framework, logger, logkit, component,
pool, sourceresolve, store
* sourceresolve -> framework, pool
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
