mcconnell 2004/08/22 06:25:42
Modified: project avalon-excalibur.xml
Log:
make framework deps explicit
Revision Changes Path
1.155 +94 -39 gump/project/avalon-excalibur.xml
Index: avalon-excalibur.xml
===================================================================
RCS file: /home/cvs/gump/project/avalon-excalibur.xml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- avalon-excalibur.xml 20 Aug 2004 06:09:57 -0000 1.154
+++ avalon-excalibur.xml 22 Aug 2004 13:25:42 -0000 1.155
@@ -67,7 +67,10 @@
<property name="project.version" value="@@DATE@@"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
+
<depend project="commons-collections" runtime="true"/>
<depend project="excalibur-instrument" runtime="true"/>
<depend project="excalibur-instrument-manager" runtime="true" id="main"/>
@@ -115,7 +118,9 @@
<property name="project.version" value="@@DATE@@"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="avalon-logkit" runtime="true"/>
<depend project="excalibur-component" runtime="true" inherit="runtime"/>
<depend project="junit" runtime="true"/>
@@ -157,7 +162,9 @@
</ant>
<!-- runtime dependencies -->
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend property="isorelax.jar" project="iso-relax" runtime="true"/>
<depend project="jing" runtime="true"/>
@@ -202,7 +209,9 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="concurrent"/>
@@ -239,7 +248,7 @@
</ant>
<!-- runtime dependencies -->
- <depend project="avalon-framework" runtime="true" id="api"/>
+ <depend project="avalon-framework-api" runtime="true"/>
<!-- build-time dependencies -->
<depend project="ant" inherit="runtime"/>
@@ -274,8 +283,9 @@
</ant>
<!-- runtime dependencies -->
- <depend project="avalon-framework" runtime="true" id="api" />
- <depend project="avalon-framework" runtime="true" id="impl" />
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="excalibur-event-api" runtime="true" />
<depend project="commons-collections" runtime="true"/>
@@ -323,7 +333,9 @@
<depend project="xml-xalan2"/>
<depend project="junit"/>
- <depend project="avalon-framework"/>
+ <depend project="avalon-framework-api"/>
+ <depend project="avalon-framework-legacy"/>
+ <depend project="avalon-framework-impl"/>
<depend project="excalibur-event-api"/>
<depend project="excalibur-event-impl"/>
@@ -355,7 +367,9 @@
<depend project="xml-xalan2"/>
<depend project="junit"/>
- <depend project="avalon-framework"/>
+ <depend project="avalon-framework-api"/>
+ <depend project="avalon-framework-legacy"/>
+ <depend project="avalon-framework-impl"/>
<depend project="excalibur-fortress-container-api"/>
<depend project="excalibur-fortress-meta"/>
<depend project="avalon-logkit"/>
@@ -405,7 +419,10 @@
<depend project="junit"/>
<depend project="xml-apis" />
- <depend project="avalon-framework"/>
+ <depend project="avalon-framework-api"/>
+ <depend project="avalon-framework-legacy"/>
+ <depend project="avalon-framework-impl"/>
+
<depend project="avalon-logkit"/>
<depend project="excalibur-fortress-container-api" />
<depend project="excalibur-fortress-container-impl" />
@@ -463,7 +480,9 @@
<depend project="excalibur-fortress-container-api"/>
<depend project="excalibur-fortress-container-impl"/>
- <depend project="avalon-framework"/>
+ <depend project="avalon-framework-api"/>
+ <depend project="avalon-framework-legacy"/>
+ <depend project="avalon-framework-impl"/>
<depend project="excalibur-event-api"/>
<depend project="excalibur-event-impl"/>
<depend project="excalibur-logger"/>
@@ -512,7 +531,9 @@
<depend project="junit"/>
<depend project="excalibur-fortress-container-api" />
- <depend project="avalon-framework" />
+ <depend project="avalon-framework-api"/>
+ <depend project="avalon-framework-legacy"/>
+ <depend project="avalon-framework-impl"/>
<depend project="qdox" />
<!-- optional dependencies -->
@@ -567,7 +588,7 @@
<ant basedir="instrument" target="jar" buildfile="gump-build.xml">
<!-- optional dependencies -->
- <depend property="avalon-framework.jar" project="avalon-framework"
id="combined"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
id="combined"/> <!-- FIX ME -->
<property name="checkstyle.jar" project="checkstyle"
reference="jarpath"/>
<!-- test-time dependencies -->
@@ -581,7 +602,9 @@
<depend project="junit"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<!-- optional dependencies -->
<option project="checkstyle" inherit="runtime"/>
@@ -613,7 +636,7 @@
</ant>
<!-- runtime dependencies -->
- <depend project="avalon-framework" runtime="true" id="api"/>
+ <depend project="avalon-framework-api" runtime="true"/>
<depend property="excalibur-instrument.jar" project="excalibur-instrument"
runtime="true"/>
<!-- build-time dependencies -->
@@ -648,8 +671,10 @@
<property name="src.exclude.pattern" value="**/package.html"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
+
<depend project="excalibur-instrument" runtime="true"/>
<depend project="excalibur-instrument-spi" runtime="true"/>
@@ -684,8 +709,10 @@
<property name="src.exclude.pattern" value="**/package.html"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
+
<depend project="excalibur-instrument" runtime="true"/>
<depend project="excalibur-instrument-spi" runtime="true"/>
<depend project="excalibur-instrument-impl" runtime="true"/>
@@ -720,8 +747,10 @@
<property name="src.exclude.pattern" value="**/package.html"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
+
<depend project="excalibur-instrument" runtime="true"/>
<depend project="excalibur-instrument-spi" runtime="true"/>
<depend project="excalibur-instrument-impl" runtime="true"/>
@@ -775,7 +804,11 @@
<depend property="altrmi-client-impl.jar" project="incubator-altrmi"
id="client-impl"/>
<depend property="altrmi-server-interfaces.jar" project="incubator-altrmi"
id="server-api"/>
<depend property="altrmi-server-impl.jar" project="incubator-altrmi"
id="server-impl"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
+
<depend project="excalibur-instrument-manager" runtime="true" id="main"/>
<!-- build-time dependencies -->
@@ -803,7 +836,9 @@
</ant>
<!-- runtime dependencies -->
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<!-- test-time dependencies -->
<depend property="junit.jar" project="junit"/>
@@ -840,7 +875,9 @@
</ant>
<!-- runtime dependencies -->
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<!-- test-time dependencies -->
<depend property="junit.jar" project="junit"/>
@@ -885,7 +922,9 @@
<option project="checkstyle" inherit="runtime"/>
<depend project="ant" inherit="runtime"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
<depend project="jakarta-servletapi-4" runtime="true"/>
<depend project="logging-log4j" runtime="true"/>
@@ -915,7 +954,9 @@
</ant>
<depend project="ant" inherit="runtime"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="excalibur-pool" inherit="runtime"/>
<depend project="excalibur-sourceresolve" inherit="runtime"/>
<depend project="xml-xerces"/>
@@ -966,7 +1007,9 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
- <depend project="avalon-framework" runtime="true" id="api"/>
+
+ <depend project="avalon-framework-api" runtime="true"/>
+
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -995,8 +1038,9 @@
<property name="do.not.test" value="true"/>
</ant>
<depend project="excalibur-pool-api" runtime="true"/>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend property="commons-collections" project="commons-collections"/>
<depend project="ant" inherit="runtime"/>
@@ -1031,8 +1075,9 @@
</ant>
<depend project="excalibur-pool-api" runtime="true"/>
<depend project="excalibur-pool-impl" runtime="true"/>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend property="commons-collections" project="commons-collections"/>
<depend project="excalibur-instrument" runtime="true"/>
@@ -1066,7 +1111,9 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="commons-httpclient"/>
@@ -1094,7 +1141,9 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="excalibur-instrument"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -1134,7 +1183,9 @@
<option project="checkstyle" inherit="runtime"/>
<depend project="ant" inherit="runtime"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -1161,8 +1212,9 @@
<property name="skip.dependencies" value="true"/>
<property name="project.version" value="@@DATE@@"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="excalibur-thread-api" runtime="true"/>
<depend project="excalibur-pool-api" runtime="true"/>
<depend project="excalibur-pool-impl" runtime="true"/>
@@ -1198,8 +1250,9 @@
<property name="skip.dependencies" value="true"/>
<property name="project.version" value="@@DATE@@"/>
</ant>
- <depend project="avalon-framework" runtime="true" id="api"/>
- <depend project="avalon-framework" runtime="true" id="impl"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="excalibur-thread-api" runtime="true"/>
<depend project="excalibur-thread-impl" runtime="true"/>
<depend project="excalibur-pool-api" runtime="true"/>
@@ -1262,7 +1315,9 @@
<option project="checkstyle" inherit="runtime"/>
<depend project="jaxen" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon-framework" runtime="true" id="combined"/>
+ <depend project="avalon-framework-api" runtime="true"/>
+ <depend project="avalon-framework-legacy" runtime="true"/>
+ <depend project="avalon-framework-impl" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<work nested="xmlutil/target/classes"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
