mcconnell 2003/08/31 07:34:08
Modified: merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl project.xml
merlin/kernel/spi project.xml
Log:
Add bootstrap updates to handle composition API.
Revision Changes Path
1.9 +3 -2 avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merlin.properties 21 Aug 2003 19:37:42 -0000 1.8
+++ merlin.properties 31 Aug 2003 14:34:08 -0000 1.9
@@ -7,10 +7,11 @@
#
# the api classpath
#
-merlin.api.classpath.length=3
+merlin.api.classpath.length=4
merlin.api.classpath.0=avalon-framework:avalon-framework-api;SNAPSHOT
merlin.api.classpath.1=avalon-meta:avalon-meta-api;SNAPSHOT
-merlin.api.classpath.2=avalon-activation:avalon-activation-api;SNAPSHOT
+merlin.api.classpath.2=avalon-composition:avalon-composition-api;SNAPSHOT
+merlin.api.classpath.3=avalon-activation:avalon-activation-api;SNAPSHOT
#
# the spi classpath
1.4 +5 -0 avalon-sandbox/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 21 Aug 2003 19:37:42 -0000 1.3
+++ project.xml 31 Aug 2003 14:34:08 -0000 1.4
@@ -58,6 +58,11 @@
<dependency>
<groupId>avalon-composition</groupId>
+ <artifactId>avalon-composition-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
<version>SNAPSHOT</version>
</dependency>
1.4 +1 -1 avalon-sandbox/merlin/kernel/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/spi/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Aug 2003 03:51:23 -0000 1.3
+++ project.xml 31 Aug 2003 14:34:08 -0000 1.4
@@ -32,7 +32,7 @@
<dependency>
<groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-spi</artifactId>
+ <artifactId>avalon-composition-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
