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/merlin-plugin project.xml
Date Mon, 01 Sep 2003 02:18:13 GMT
mcconnell    2003/08/31 19:18:13

  Modified:    merlin   platform.xml
               merlin/activation project.xml
               merlin/activation/src/java/org/apache/avalon/activation/appliance/impl
                        DefaultAppliance.java
               merlin/activation/src/test/conf block.xml
               merlin/composition/impl project.xml
               merlin/kernel/bootstrap/src/etc merlin.properties
               merlin/kernel/impl project.xml
               merlin/merlin-extensions/merlin-servlet project.xml
               merlin/merlin-platform/examples/afs/simple project.xml
               merlin/merlin-platform/examples/afs/simple-servlet
                        project.xml
               merlin/merlin-plugin project.xml
  Log:
  Update with lifecycle extensions.
  
  Revision  Changes    Path
  1.2       +2 -1      avalon-sandbox/merlin/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/platform.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- platform.xml	31 Aug 2003 14:42:52 -0000	1.1
  +++ platform.xml	1 Sep 2003 02:18:13 -0000	1.2
  @@ -119,7 +119,8 @@
       <!-- excalibur dependencies -->
       
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
       </dependency>
   
  
  
  
  1.8       +2 -1      avalon-sandbox/merlin/activation/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	31 Aug 2003 14:33:22 -0000	1.7
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.8
  @@ -110,7 +110,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
       </dependency>
       <dependency>
  
  
  
  1.10      +5 -1      avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultAppliance.java	31 Aug 2003 14:37:48 -0000	1.9
  +++ DefaultAppliance.java	1 Sep 2003 02:18:13 -0000	1.10
  @@ -830,6 +830,7 @@
         throws Exception
       {
           StageDescriptor[] stages = m_model.getType().getStages();
  +        getLogger().debug( "stage count: " + stages.length );
           for( int i=0; i<stages.length; i++ )
           {
               StageDescriptor stage = stages[i];
  @@ -840,6 +841,9 @@
               // verify assignability
    
               Class c = ((DeploymentModel)provider.getModel()).getDeploymentClass();
  +            getLogger().debug( "processing create: " + c.getName() 
  +              + ", [" +  Creator.class.isAssignableFrom( c ) + "]" );
  +
               if( Creator.class.isAssignableFrom( c ) )
               {
                   Creator handler = (Creator) provider.resolve( this );
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/activation/src/test/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/src/test/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	7 Aug 2003 17:11:24 -0000	1.1
  +++ block.xml	1 Sep 2003 02:18:13 -0000	1.2
  @@ -11,7 +11,7 @@
          <repository>
            <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
            <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  -         <resource id="excalibur-lifecycle:excalibur-lifecycle" version="1.0"/>
  +         <resource id="excalibur-lifecycle:excalibur-lifecycle-api" version="1.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.2       +2 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	31 Aug 2003 14:29:46 -0000	1.1
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.2
  @@ -95,7 +95,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
       </dependency>
       <dependency>
  
  
  
  1.10      +3 -3      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- merlin.properties	31 Aug 2003 14:34:08 -0000	1.9
  +++ merlin.properties	1 Sep 2003 02:18:13 -0000	1.10
  @@ -7,23 +7,23 @@
   #
   # the api classpath
   #
  -merlin.api.classpath.length=4
  +merlin.api.classpath.length=5
   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-composition:avalon-composition-api;SNAPSHOT
   merlin.api.classpath.3=avalon-activation:avalon-activation-api;SNAPSHOT
  +merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
   
   #
   # the spi classpath
   #
  -merlin.spi.classpath.length=7
  +merlin.spi.classpath.length=6
   merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;SNAPSHOT
   merlin.spi.classpath.1=avalon-extension:avalon-extension-spi;SNAPSHOT
   merlin.spi.classpath.2=avalon-composition:avalon-composition-spi;SNAPSHOT
   merlin.spi.classpath.3=avalon-activation:avalon-activation-spi;SNAPSHOT
   merlin.spi.classpath.4=avalon-repository:avalon-repository-spi;SNAPSHOT
   merlin.spi.classpath.5=merlin:merlin-kernel-spi;SNAPSHOT
  -merlin.spi.classpath.6=excalibur-lifecycle:excalibur-lifecycle;1.0
   
   #
   # the bootstrap classpath
  
  
  
  1.5       +2 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	31 Aug 2003 14:34:08 -0000	1.4
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.5
  @@ -127,7 +127,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
       </dependency>
       <dependency>
  
  
  
  1.12      +2 -1      avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	21 Aug 2003 19:37:42 -0000	1.11
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.12
  @@ -155,7 +155,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
  
  
  
  1.7       +2 -1      avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	21 Aug 2003 19:37:42 -0000	1.6
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.7
  @@ -58,7 +58,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
       </dependency>
       
  
  
  
  1.7       +2 -1      avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	21 Aug 2003 19:37:42 -0000	1.6
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.7
  @@ -90,7 +90,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
  
  
  
  1.19      +2 -1      avalon-sandbox/merlin/merlin-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- project.xml	31 Aug 2003 14:35:32 -0000	1.18
  +++ project.xml	1 Sep 2003 02:18:13 -0000	1.19
  @@ -117,7 +117,8 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-lifecycle</id>
  +      <groupId>excalibur-lifecycle</groupId>
  +      <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
       </dependency>
   
  
  
  

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


Mime
View raw message