You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/10/14 00:51:09 UTC

cvs commit: avalon/merlin/kernel/bootstrap/src/etc merlin.properties

mcconnell    2003/10/13 15:51:09

  Modified:    merlin/kernel/bootstrap/src/etc merlin.properties
  Log:
  Move extension spi to the api loader because it is used by the containement api and will not be found in a lower lever loader.
  
  Revision  Changes    Path
  1.3       +6 -6      avalon/merlin/kernel/bootstrap/src/etc/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/etc/merlin.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- merlin.properties	13 Oct 2003 01:28:26 -0000	1.2
  +++ merlin.properties	13 Oct 2003 22:51:09 -0000	1.3
  @@ -12,16 +12,16 @@
   merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.0b1
   merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.0b1
   merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
  +merlin.spi.classpath.5=avalon-extension:avalon-extension-spi;1.0
  +merlin.spi.classpath.6=merlin:merlin-kernel-spi;3.1b2
   
   #
   # the spi classpath
   #
   merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.1
  -merlin.spi.classpath.1=avalon-extension:avalon-extension-spi;1.0
  -merlin.spi.classpath.2=avalon-composition:avalon-composition-spi;1.0b1
  -merlin.spi.classpath.3=avalon-activation:avalon-activation-spi;1.0b1
  -merlin.spi.classpath.4=avalon-repository:avalon-repository-spi;1.0b1
  -merlin.spi.classpath.5=merlin:merlin-kernel-spi;3.1b2
  +merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.0b1
  +merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.0b1
  +merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.0b1
   
   #
   # the bootstrap classpath
  @@ -34,7 +34,7 @@
   merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
   merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0b1
   merlin.impl.classpath.7=commons-cli:commons-cli;1.0
  -merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.0b1
  +merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.1b2
   merlin.impl.classpath.9=logkit:logkit;1.2
   merlin.impl.classpath.10=excalibur-event:excalibur-event;1.0.3
   merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org