avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/repository/spi project.xml
Date Fri, 12 Sep 2003 21:10:57 GMT
mcconnell    2003/09/12 14:10:57

  Modified:    merlin   INSTALLATION.TXT platform.xml project.xml
               merlin/activation/api project.xml
               merlin/activation/impl project.xml
               merlin/activation/impl/src/test/conf block.xml
               merlin/activation/spi project.xml
               merlin/composition/api project.xml
               merlin/composition/impl project.xml
               merlin/composition/impl/src/test/conf block.xml context.xml
                        data-test.xml
               merlin/composition/spi project.xml
               merlin/extension/impl project.xml
               merlin/extension/spi project.xml
               merlin/kernel/bootstrap project.xml
               merlin/kernel/bootstrap/src/etc merlin.properties
               merlin/kernel/bootstrap/src/java Merlin.java
               merlin/kernel/impl project.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernel.java
               merlin/kernel/plugin project.xml
               merlin/kernel/spi project.xml
               merlin/merlin-extensions/merlin-jmx/conf block.xml
               merlin/merlin-platform/src/config kernel.xml
               merlin/merlin-platform/tutorials/composition/application/impl
                        project.xml
               merlin/merlin-platform/tutorials/composition/application/impl/conf
                        block.xml
               merlin/merlin-platform/tutorials/composition/location/api
                        project.xml
               merlin/merlin-platform/tutorials/composition/location/impl
                        project.xml
               merlin/merlin-platform/tutorials/composition/location/impl/conf
                        block.xml
               merlin/merlin-platform/tutorials/composition/publisher/api
                        project.xml
               merlin/merlin-platform/tutorials/composition/publisher/impl
                        project.xml
               merlin/merlin-platform/tutorials/composition/publisher/impl/conf
                        block.xml
               merlin/merlin-platform/tutorials/configuration/block
                        project.xml
               merlin/merlin-platform/tutorials/configuration/block/conf
                        block.xml
               merlin/merlin-platform/tutorials/configuration/defaults
                        project.xml
               merlin/merlin-platform/tutorials/configuration/defaults/conf
                        block.xml
               merlin/merlin-platform/tutorials/configuration/override
                        project.xml
               merlin/merlin-platform/tutorials/configuration/override/conf
                        block.xml
               merlin/merlin-platform/tutorials/context/avalon project.xml
               merlin/merlin-platform/tutorials/context/avalon/conf
                        block.xml
               merlin/merlin-platform/tutorials/context/casting project.xml
               merlin/merlin-platform/tutorials/context/casting/conf
                        block.xml
               merlin/merlin-platform/tutorials/context/custom project.xml
               merlin/merlin-platform/tutorials/context/custom/conf
                        block.xml
               merlin/merlin-platform/tutorials/context/strategy
                        project.xml
               merlin/merlin-platform/tutorials/context/strategy/conf
                        block.xml
               merlin/merlin-platform/tutorials/dependencies/auto
                        project.xml
               merlin/merlin-platform/tutorials/dependencies/auto/conf
                        block.xml
               merlin/merlin-platform/tutorials/dependencies/manual
                        project.xml
               merlin/merlin-platform/tutorials/dependencies/manual/conf
                        block.xml
               merlin/merlin-platform/tutorials/hello project.xml
               merlin/merlin-platform/tutorials/hello/conf block.xml
               merlin/merlin-platform/tutorials/lifecycle/activation
                        project.xml
               merlin/merlin-platform/tutorials/lifecycle/activation/conf
                        block.xml
               merlin/merlin-platform/tutorials/lifecycle/excalibur
                        project.xml
               merlin/merlin-platform/tutorials/lifecycle/excalibur/conf
                        block.xml
               merlin/merlin-platform/tutorials/meta project.xml
               merlin/repository/impl project.xml
               merlin/repository/spi project.xml
  Log:
  Updated for RC2.
  
  Revision  Changes    Path
  1.6       +2 -2      avalon-sandbox/merlin/INSTALLATION.TXT
  
  Index: INSTALLATION.TXT
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/INSTALLATION.TXT,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- INSTALLATION.TXT	10 Sep 2003 22:59:46 -0000	1.5
  +++ INSTALLATION.TXT	12 Sep 2003 21:10:55 -0000	1.6
  @@ -35,8 +35,8 @@
     > # set location of merlin
     > export MERLIN_HOME=/opt/merlin
     > # include it in the path
  -  > export PATH=$PATH:MERLIN_HOME
  -  > ' > ~/.bash_profile
  +  > export PATH=$PATH:$MERLIN_HOME/bin
  +  > ' >> ~/.bash_profile
     $ source ~/.bash_profile
   
   Under Windows you can set environment variables by selecting the 
  
  
  
  1.6       +20 -20    avalon-sandbox/merlin/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/platform.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- platform.xml	10 Sep 2003 20:14:58 -0000	1.5
  +++ platform.xml	12 Sep 2003 21:10:55 -0000	1.6
  @@ -28,12 +28,12 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-kernel-spi</artifactId>
  -      <version>3.0-beta-1-RC1</version>
  +      <version>3.0b1</version>
       </dependency>
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-kernel-impl</artifactId>
  -      <version>3.0-beta-1-RC1</version>
  +      <version>3.0b1</version>
       </dependency>
   
       <!-- avalon dependecies -->
  @@ -41,44 +41,44 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-tools</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
  @@ -89,44 +89,44 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-impl</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
  @@ -150,11 +150,11 @@
   
       <dependency>
         <id>excalibur-i18n</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-pool</id>
  
  
  
  1.36      +1 -1      avalon-sandbox/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- project.xml	11 Sep 2003 04:16:38 -0000	1.35
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.36
  @@ -6,7 +6,7 @@
     <groupId>merlin</groupId>
     <id>merlin</id>
     <name>Merlin POM</name>
  -  <currentVersion>3.0-RC1</currentVersion>
  +  <currentVersion>3.0</currentVersion>
   
     <organization>
       <name>Apache Software Foundation</name>
  
  
  
  1.2       +4 -4      avalon-sandbox/merlin/activation/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	10 Sep 2003 08:54:54 -0000	1.1
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.2
  @@ -8,7 +8,7 @@
     <id>avalon-activation-api</id>
     <name>Avalon Activation API</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Activation API</shortDescription>
  @@ -22,17 +22,17 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.4       +17 -17    avalon-sandbox/merlin/activation/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	12 Sep 2003 14:00:38 -0000	1.3
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.4
  @@ -8,7 +8,7 @@
     <id>avalon-activation-impl</id>
     <name>Avalon Activation Framework</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Runtime activation framework.</shortDescription>
  @@ -33,77 +33,77 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-impl</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
   
  @@ -127,11 +127,11 @@
       </dependency>
       <dependency>
         <id>excalibur-i18n</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-pool</id>
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/activation/impl/src/test/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/impl/src/test/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:55 -0000	1.3
  @@ -9,7 +9,7 @@
        <classpath>
          <fileset dir="."/>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.2       +8 -8      avalon-sandbox/merlin/activation/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/spi/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	10 Sep 2003 08:57:32 -0000	1.1
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.2
  @@ -8,7 +8,7 @@
     <id>avalon-activation-spi</id>
     <name>Avalon Activation SPI</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Activation Service Provider Interface</shortDescription>
  @@ -24,41 +24,41 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
  
  
  
  1.4       +6 -6      avalon-sandbox/merlin/composition/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	12 Sep 2003 14:00:38 -0000	1.3
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.4
  @@ -8,7 +8,7 @@
     <id>avalon-composition-api</id>
     <name>Avalon Composition API</name>
     <package>org.apache.avalon.assembly</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition SPI</shortDescription>
  @@ -22,30 +22,30 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.5       +14 -14    avalon-sandbox/merlin/composition/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	10 Sep 2003 21:58:21 -0000	1.4
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.5
  @@ -8,7 +8,7 @@
     <id>avalon-composition-impl</id>
     <name>Avalon Composition Framework</name>
     <package>org.apache.avalon.composition</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition Framework.</shortDescription>
  @@ -20,61 +20,61 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-impl</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <!-- logkit -->
  @@ -99,11 +99,11 @@
       </dependency>
       <dependency>
         <id>excalibur-i18n</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-pool</id>
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/composition/impl/src/test/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/src/test/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:55 -0000	1.3
  @@ -21,7 +21,7 @@
            <include>test-c.jar</include>
          </fileset>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            <resource id="test:test-d"/>
          </repository>
        </classpath>
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/composition/impl/src/test/conf/context.xml
  
  Index: context.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/src/test/conf/context.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- context.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ context.xml	12 Sep 2003 21:10:55 -0000	1.3
  @@ -6,7 +6,7 @@
        <classpath>
          <!-- 
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
          -->
          <fileset dir="ext">
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/composition/impl/src/test/conf/data-test.xml
  
  Index: data-test.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/src/test/conf/data-test.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- data-test.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ data-test.xml	12 Sep 2003 21:10:55 -0000	1.3
  @@ -17,7 +17,7 @@
            <include>sally.jar</include>
          </fileset>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            <resource id="cornerstone-threads:cornerstone-threads-api"/>
          </repository>
          <repository>
  
  
  
  1.4       +7 -7      avalon-sandbox/merlin/composition/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/spi/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	12 Sep 2003 14:00:38 -0000	1.3
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.4
  @@ -8,7 +8,7 @@
     <id>avalon-composition-spi</id>
     <name>Avalon Composition SPI</name>
     <package>org.apache.avalon.assembly</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition SPI</shortDescription>
  @@ -22,36 +22,36 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/extension/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/extension/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 00:35:40 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.3
  @@ -5,7 +5,7 @@
     <groupId>avalon-extension</groupId>
     <id>avalon-extension-impl</id>
     <name>Avalon Extension Framework</name>
  -  <currentVersion>1.0-RC1</currentVersion>
  +  <currentVersion>1.0</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Extension Management Implementation</shortDescription>
  @@ -23,7 +23,7 @@
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <!-- pre JDK 1.4 dependencies -->
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/extension/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/extension/spi/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 00:35:40 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.3
  @@ -5,7 +5,7 @@
     <groupId>avalon-extension</groupId>
     <id>avalon-extension-spi</id>
     <name>Avalon Extension SPI</name>
  -  <currentVersion>1.0-RC1</currentVersion>
  +  <currentVersion>1.0</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Extension Management SPI</shortDescription>
     <gumpRepositoryId>avalon-extension-spi</gumpRepositoryId>
  
  
  
  1.6       +2 -2      avalon-sandbox/merlin/kernel/bootstrap/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/bootstrap/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 12:38:51 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.6
  @@ -21,12 +21,12 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.16      +19 -19    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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- merlin.properties	10 Sep 2003 14:20:58 -0000	1.15
  +++ merlin.properties	12 Sep 2003 21:10:55 -0000	1.16
  @@ -7,36 +7,36 @@
   #
   # the api classpath
   #
  -merlin.api.classpath.0=avalon-framework:avalon-framework-api;4.1.5-RC3
  -merlin.api.classpath.1=avalon-meta:avalon-meta-api;1.1-RC1
  -merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.0-beta-1-RC1
  -merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.0-beta-1-RC1
  +merlin.api.classpath.0=avalon-framework:avalon-framework-api;4.1.5
  +merlin.api.classpath.1=avalon-meta:avalon-meta-api;1.1
  +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
   
   #
   # the spi classpath
   #
  -merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.1-RC1
  -merlin.spi.classpath.1=avalon-extension:avalon-extension-spi;1.0-RC1
  -merlin.spi.classpath.2=avalon-composition:avalon-composition-spi;1.0-beta-1-RC1
  -merlin.spi.classpath.3=avalon-activation:avalon-activation-spi;1.0-beta-1-RC1
  -merlin.spi.classpath.4=avalon-repository:avalon-repository-spi;1.0-beta-1-RC1
  -merlin.spi.classpath.5=merlin:merlin-kernel-spi;3.0-beta-1-RC1
  +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.0b1
   
   #
   # the bootstrap classpath
   #
  -merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5-RC3
  -merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.1-RC1
  -merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0-RC1
  -merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.0-beta-1-RC1
  -merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.0-beta-1-RC1
  -merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1-RC1
  -merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0-beta-1-RC1
  +merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5
  +merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.1
  +merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
  +merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.0b1
  +merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.0b1
  +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.0-beta-1-RC1
  +merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.0b1
   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-RC1
  +merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1
   merlin.impl.classpath.12=mx4j:mx4j-jmx;1.1.1
   merlin.impl.classpath.13=mx4j:mx4j-tools;1.1.1
  
  
  
  1.13      +7 -14     avalon-sandbox/merlin/kernel/bootstrap/src/java/Merlin.java
  
  Index: Merlin.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/bootstrap/src/java/Merlin.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Merlin.java	9 Sep 2003 14:26:59 -0000	1.12
  +++ Merlin.java	12 Sep 2003 21:10:55 -0000	1.13
  @@ -148,22 +148,15 @@
   
           Repository repository = null;
           String remote = 
  -          System.getProperty( MERLIN_REPOSITORY_REMOTE_KEY );
  -        if( remote != null )
  +          System.getProperty( MERLIN_REPOSITORY_REMOTE_KEY, REPOSITORY );
  +        if( debug )
           {
  -            if( debug )
  -            {
  -                System.out.println( "MERLIN BOOTSTRAP REMOTE: " + remote );
  -            }
  -
  -            URL remoteURL = new URL( remote );
  -            repository = 
  -              new DefaultFileRepository( base, null, new URL[]{ remoteURL } );
  -        }
  -        else
  -        {
  -            repository = new DefaultFileRepository( base, null, new URL[0] );
  +            System.out.println( "MERLIN BOOTSTRAP REMOTE: " + remote );
           }
  +
  +        URL remoteURL = new URL( remote );
  +        repository = 
  +          new DefaultFileRepository( base, null, new URL[]{ remoteURL } );
   
           //
           // get the set of URLs for the bootstrap classloader from the 
  
  
  
  1.8       +19 -19    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 Sep 2003 09:40:33 -0000	1.7
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.8
  @@ -9,7 +9,7 @@
     <name>Merlin Kernel Implementation</name>
     <package>org.apache.avalon.merlin</package>
   
  -  <currentVersion>3.0-beta-1-RC1</currentVersion>
  +  <currentVersion>3.0b1</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Merlin Kernel Implementation</shortDescription>
   
  @@ -37,7 +37,7 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-kernel-spi</artifactId>
  -      <version>3.0-beta-1-RC1</version>
  +      <version>3.0b1</version>
       </dependency>
   
       <!-- avalon dependecies -->
  @@ -45,82 +45,82 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-impl</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
   
  @@ -146,11 +146,11 @@
       </dependency>
       <dependency>
         <id>excalibur-i18n</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-event</id>
  
  
  
  1.14      +2 -2      avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultKernel.java	9 Sep 2003 02:15:27 -0000	1.13
  +++ DefaultKernel.java	12 Sep 2003 21:10:55 -0000	1.14
  @@ -508,6 +508,7 @@
               {
                   getLogger().debug( "deployment phase" );
                   m_block.deploy();
  +                m_self.setEnabled( true );
               }
               catch( Throwable e )
               {
  @@ -534,7 +535,6 @@
                       setState( STARTED );
                   }
               }
  -            m_self.setEnabled( true );
           }
       }
   
  
  
  
  1.5       +19 -19    avalon-sandbox/merlin/kernel/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/plugin/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	10 Sep 2003 12:38:51 -0000	1.4
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.5
  @@ -30,13 +30,13 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-kernel-spi</artifactId>
  -      <version>3.0-beta-1-RC1</version>
  +      <version>3.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-kernel-impl</artifactId>
  -      <version>3.0-beta-1-RC1</version>
  +      <version>3.0b1</version>
       </dependency>
   
       <!-- avalon -->
  @@ -44,82 +44,82 @@
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-impl</artifactId>
  -      <version>1.0-RC1</version>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-impl</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <!-- excalibur -->
  @@ -137,7 +137,7 @@
   
       <dependency>
         <id>excalibur-i18n</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
   
       <dependency>
  @@ -158,7 +158,7 @@
   
       <dependency>
         <id>excalibur-configuration</id>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
       
       <!-- other -->
  
  
  
  1.7       +6 -6      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	10 Sep 2003 09:40:33 -0000	1.6
  +++ project.xml	12 Sep 2003 21:10:55 -0000	1.7
  @@ -9,7 +9,7 @@
     <name>Merlin Kernel SPI</name>
     <package>org.apache.avalon.merlin</package>
   
  -  <currentVersion>3.0-beta-1-RC1</currentVersion>
  +  <currentVersion>3.0b1</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Merlin Kernel SPI</shortDescription>
     <description>
  @@ -21,30 +21,30 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
   
       <dependency>
  
  
  
  1.5       +2 -2      avalon-sandbox/merlin/merlin-extensions/merlin-jmx/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jmx/conf/block.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.4
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.5
  @@ -8,8 +8,8 @@
       <classloader>
         <classpath>
           <repository>
  -          <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
  -          <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +          <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +          <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
             <resource id="mx4j:mx4j-jmx" version="1.1.1"/>
             <resource id="mx4j:mx4j-tools" version="1.1.1"/>
             <resource id="merlin:merlin-jmx" version="SNAPSHOT"/>
  
  
  
  1.15      +2 -5      avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- kernel.xml	12 Sep 2003 16:43:49 -0000	1.14
  +++ kernel.xml	12 Sep 2003 21:10:56 -0000	1.15
  @@ -1,12 +1,9 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
  -<kernel>
  +<kernel> 
   
  -   <logging target="kernel" priority="INFO" name="kernel">
  +   <logging priority="INFO" name="kernel">
         <category name="/logger" priority="WARN"/>
  -      <target name="kernel">
  -        <file location="logs/kernel.log" />
  -      </target>
      </logging>
   
      <repository>
  
  
  
  1.6       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.6
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -4,8 +4,8 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +           <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
              <resource id="merlin-tutorial:locator-api" version="1.0"/>
              <resource id="merlin-tutorial:publisher-api" version="1.0"/>
              <resource id="merlin-tutorial:application-impl" version="1.0"/>
  
  
  
  1.6       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.6
  @@ -12,7 +12,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.6       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.6
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -10,8 +10,8 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            <resource id="merlin-tutorial:locator-api" version="1.0"/>
            <resource id="merlin-tutorial:locator-impl" version="1.0"/>
          </repository>
  
  
  
  1.6       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.6
  @@ -12,7 +12,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.6       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.6
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -10,8 +10,8 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            <resource id="merlin-tutorial:publisher-api" version="1.0"/>
            <resource id="merlin-tutorial:publisher-impl" version="1.0"/>
          </repository>
  
  
  
  1.8       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.7
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.8
  @@ -10,12 +10,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.5       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- block.xml	10 Sep 2003 11:07:05 -0000	1.4
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.5
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.8       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 Sep 2003 11:07:05 -0000	1.7
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.8
  @@ -10,12 +10,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.6       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.5
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.6
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.8       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.7
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.8
  @@ -10,12 +10,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.5       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.4
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.5
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:56 -0000	1.3
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -16,17 +16,17 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -8,7 +8,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -16,13 +16,13 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -4,8 +4,8 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +           <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            </repository>
          </classpath>
        </classloader>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -16,13 +16,13 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -4,7 +4,7 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            </repository>
          </classpath>
        </classloader>
  
  
  
  1.5       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/hello/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.4
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.5
  @@ -21,13 +21,13 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.6       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.5
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.6
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +5 -5      avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -16,27 +16,27 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
  -      <version>1.1-RC1</version>
  +      <version>1.1</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 11:07:06 -0000	1.2
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>excalibur-lifecycle</groupId>
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Sep 2003 11:07:07 -0000	1.2
  +++ block.xml	12 Sep 2003 21:10:57 -0000	1.3
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.7       +2 -2      avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	10 Sep 2003 11:07:07 -0000	1.6
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.7
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-RC3</version>
  +      <version>4.1.5</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.6       +2 -2      avalon-sandbox/merlin/repository/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/repository/impl/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 Sep 2003 08:16:26 -0000	1.5
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.6
  @@ -8,7 +8,7 @@
     <id>avalon-repository-impl</id>
     <name>Avalon Repository Implementation</name>
     <package>org.apache.avalon.repository</package>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Jar file repository implementation.</shortDescription>
  @@ -17,7 +17,7 @@
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  -      <version>1.0-beta-1-RC1</version>
  +      <version>1.0b1</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.5       +1 -1      avalon-sandbox/merlin/repository/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/repository/spi/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	10 Sep 2003 08:16:26 -0000	1.4
  +++ project.xml	12 Sep 2003 21:10:57 -0000	1.5
  @@ -7,7 +7,7 @@
     <groupId>avalon-repository</groupId>
     <id>avalon-repository-spi</id>
     <name>Avalon Repository SPI</name>
  -  <currentVersion>1.0-beta-1-RC1</currentVersion>
  +  <currentVersion>1.0b1</currentVersion>
   
     <package>org.apache.avalon.repository</package>
   
  
  
  

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


Mime
View raw message