avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/tutorials/hello/src/java/tutorial HelloComponent.java
Date Sat, 22 Nov 2003 12:52:56 GMT
mcconnell    2003/11/22 04:52:56

  Modified:    merlin   maven.xml platform.xml project.xml
               merlin/activation/api/src/java/org/apache/avalon/activation/appliance
                        Engine.java
               merlin/activation/impl project.xml
               merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
                        AbstractBlock.java
               merlin/composition/api/src/java/org/apache/avalon/composition/model
                        ContainmentModel.java
               merlin/composition/impl project.xml
               merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
                        DefaultContainmentModel.java
                        DefaultDeploymentModel.java
               merlin/kernel/bootstrap/src/etc merlin.properties
               merlin/kernel/impl project.xml
               merlin/kernel/plugin project.xml
               merlin/kernel/unit/src/etc merlin.properties
               merlin/platform/tutorials/hello project.xml
               merlin/platform/tutorials/hello/src/java/tutorial
                        HelloComponent.java
  Log:
  Correct test for a parameterizable object - bug identified by Jaroslaw Palka.  Version for
composition impl racked up to 3.2.1. Dependent builds updated to reflect version change.
  
  Revision  Changes    Path
  1.9       +10 -40    avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- maven.xml	13 Nov 2003 01:56:42 -0000	1.8
  +++ maven.xml	22 Nov 2003 12:52:55 -0000	1.9
  @@ -4,7 +4,7 @@
   
     <ant:property name="merlin.bootstrap.jar" value="merlin-bootstrap-1.0.jar"/>
     <ant:property name="merlin.plugin.jar" value="merlin-plugin-1.1-SNAPSHOT.jar"/>
  -  <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.2-SNAPSHOT.jar"/>
  +  <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.2.jar"/>
   
     <ant:property file="project.properties"/>
     <ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
  @@ -258,11 +258,19 @@
     -->
     <goal name="ximport">
       <j:forEach var="dep" items="${pom.dependencies}">
  +
         <j:if test="${dep.getId() != 'junit:junit'}">
           <mkdir dir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s"/>
           <copy 
             todir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s/"
             file="${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"/>
  +
  +        <util:available file="${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}.meta">
  +          <copy failonerror="false"
  +            todir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s/"
  +            file="${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}.meta"/>
  +        </util:available>
  +
         </j:if>
       </j:forEach>
     </goal>
  @@ -390,45 +398,7 @@
     Write a build signature for each package.
     -->
     <preGoal name="java:compile">
  -    <ant:property name="filename" value="${maven.build.dir}/classes/${pom.artifactId}.artifact"/>
  -    <j:set var="offset" value="${pom.artifactId.length()}"/>
  -    <j:set var="scrap" value="${snapshotSignature.substring(offset,snapshotSignature.length())}"/>
  -    <j:set var="signature" value="${scrap.substring(1,scrap.length())}"/>
  -    <ant:echo message="Building ${pom.artifactId} ${signature}"/>
  -    <ant:echo file="${filename}">
  -#
  -# Artifact descriptor.
  -# 
  -
  -avalon.artifact.group = ${pom.groupId}
  -avalon.artifact.name = ${pom.artifactId}
  -avalon.artifact.version = ${pom.currentVersion}
  -avalon.artifact.signature = ${signature}
  -
  -#
  -# Implementation dependencies.
  -#
  -</ant:echo>
  -    <j:set var="index" value="0"/>
  -    <j:forEach var="dep" items="${pom.dependencies}">
  -      <j:set var="key" value="${dep.groupId}:${dep.artifactId};${dep.version}"/>
  -      <ant:echo file="${filename}" append="true">
  -avalon.dependency.${index} = ${key}</ant:echo>
  -      <j:set var="j" value="0"/>
  -      <j:forEach var="p" items="${dep.properties}">
  -        <j:set var="v" value="${p.substring(9,p.length())}"/>
  -        <j:set var="pos" value="${v.indexOf(':')}"/>
  -        <j:set var="len" value="${v.length()}"/>
  -        <j:set var="key" value="${v.substring(0,pos)}"/>
  -        <j:set var="value" value="${v.substring(pos,len)}"/>
  -        <ant:echo file="${filename}" append="true">
  -avalon.dependency.${index}.${key} = ${value.substring( 1, value.length() )}</ant:echo>
  -        <j:set var="j" value="${j+1}"/>
  -      </j:forEach>
  -      <j:set var="index" value="${index+1}"/>
  -    </j:forEach>
  -    <ant:echo file="${filename}" append="true">
  -</ant:echo>
  +    <attainGoal name="avalon:artifact"/>
     </preGoal>
   
   </project>
  
  
  
  1.10      +1 -1      avalon/merlin/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- platform.xml	3 Nov 2003 23:57:29 -0000	1.9
  +++ platform.xml	22 Nov 2003 12:52:55 -0000	1.10
  @@ -126,7 +126,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2-dev</version>
  +      <version>1.2.1-dev</version>
       </dependency>
   
       <dependency>
  
  
  
  1.9       +6 -0      avalon/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	4 Nov 2003 17:37:35 -0000	1.8
  +++ project.xml	22 Nov 2003 12:52:55 -0000	1.9
  @@ -268,6 +268,12 @@
           </includes>
         </resource>
         <resource>
  +        <directory>${basedir}/target</directory>
  +        <includes>
  +          <include>*.meta</include>
  +        </includes>
  +      </resource>
  +      <resource>
           <directory>${basedir}/../</directory>
           <includes>
             <include>LICENSE.txt</include>
  
  
  
  1.3       +25 -6     avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Engine.java
  
  Index: Engine.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Engine.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Engine.java	17 Oct 2003 03:26:28 -0000	1.2
  +++ Engine.java	22 Nov 2003 12:52:55 -0000	1.3
  @@ -68,39 +68,58 @@
       * Return an appliance relative to a supplied dependency model.
       * @param dependency the dependency model
       * @return the appliance
  +    * @exception NoProviderDefinitionException if no provider an be found
  +    *    for the supplied dependency
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       Appliance locate( DependencyModel dependency )
  -      throws Exception;
  +      throws NoProviderDefinitionException, ApplianceException;
   
      /**
       * Return an appliance relative to a supplied dependency descriptor.
       * @param dependency the dependency descriptor
       * @return the appliance
  +    * @exception NoProviderDefinitionException if no provider an be found
  +    *    for the supplied dependency
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       Appliance locate( DependencyDescriptor dependency )
  -      throws Exception;
  +      throws NoProviderDefinitionException, ApplianceException;
   
      /**
       * Return an appliance relative to a supplied stage model.
       * @param stage the stage model
       * @return the appliance
  +    * @exception NoProviderDefinitionException if no provider an be found
  +    *    for the supplied stage
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       Appliance locate( StageModel stage )
  -      throws Exception;
  +      throws NoProviderDefinitionException, ApplianceException;
   
      /**
       * Return an appliance relative to a supplied stage descriptor.
       * @param stage the stage descriptor
       * @return the appliance
  +    * @exception NoProviderDefinitionException if no provider an be found
  +    *    for the supplied stage
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       Appliance locate( StageDescriptor stage )
  -      throws Exception;
  +      throws NoProviderDefinitionException, ApplianceException;
   
      /**
       * Return an appliance relative to a supplied path.
       * @param path the appliance path
       * @return the appliance
  +    * @exception IllegalArgumentException if the supplied path is invalid
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       Appliance locate( String path )
  -      throws Exception;
  +      throws IllegalArgumentException, ApplianceException;
   }
  
  
  
  1.8       +1 -1      avalon/merlin/activation/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	3 Nov 2003 23:57:29 -0000	1.7
  +++ project.xml	22 Nov 2003 12:52:55 -0000	1.8
  @@ -65,7 +65,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2-dev</version>
  +      <version>1.2.1-dev</version>
       </dependency>
   
       <dependency>
  
  
  
  1.4       +36 -14    avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
  
  Index: AbstractBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractBlock.java	4 Nov 2003 01:07:52 -0000	1.3
  +++ AbstractBlock.java	22 Nov 2003 12:52:55 -0000	1.4
  @@ -164,10 +164,14 @@
      /**
       * Return an appliance relative to a supplied dependency model.
       * @param dependency the dependency model
  +    * @exception NoProviderDefinitionException if no provider an be found
  +    *    for the supplied dependency
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       * @return the appliance
       */
       public Appliance locate( DependencyModel dependency )
  -      throws Exception
  +      throws NoProviderDefinitionException, ApplianceException
       {
           final String path = dependency.getPath();
           if( path != null )
  @@ -186,10 +190,11 @@
       * @return the appliance
       * @exception NoProviderDefinitionException if no provider an be found
       *    for the supplied dependency
  -    * @exception Exception if an error occurs
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       public Appliance locate( DependencyDescriptor dependency )
  -      throws Exception
  +      throws NoProviderDefinitionException, ApplianceException
       {
           if( getLogger().isDebugEnabled() )
           {
  @@ -216,7 +221,7 @@
               appliance = createAppliance( model );
               if( appliance instanceof Composite )
               {
  -                ((Composite)appliance).assemble();
  +               ((Composite)appliance).assemble();
               }
               m_repository.addAppliance( appliance );
               return appliance;
  @@ -241,10 +246,14 @@
      /**
       * Return an appliance relative to a supplied stage model.
       * @param stage the stage model
  +    * @exception NoProviderDefinitionException if no provider an be found
  +    *    for the supplied stage
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       * @return the appliance
       */
       public Appliance locate( StageModel stage )
  -      throws Exception
  +      throws NoProviderDefinitionException, ApplianceException
       {
           final String path = stage.getPath();
           if( path != null )
  @@ -263,10 +272,12 @@
       * @return the appliance
       * @exception NoProviderDefinitionException if no provider an be found
       *    for the supplied stage
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       * @exception Exception if an error occurs
       */
       public Appliance locate( StageDescriptor stage )
  -      throws NoProviderDefinitionException, Exception
  +      throws NoProviderDefinitionException, ApplianceException
       {
           if( getLogger().isDebugEnabled() )
           {
  @@ -316,10 +327,12 @@
       * Return an appliance relative to a specific path.
       * @param source the appliance path
       * @return the appliance
  -    * @exception Exception if an error occurs
  +    * @exception IllegalArgumentException if the supplied path is invalid
  +    * @exception ApplianceException if an error occurs during appliance
  +    *    resolution
       */
       public Appliance locate( String source )
  -      throws Exception
  +      throws IllegalArgumentException, ApplianceException
       {
           String path = source;
           if(( source.length() > 1 ) && source.endsWith( "/" ))
  @@ -344,16 +357,16 @@
               int j = name.indexOf( "/" );
               if( j == -1 )
               {
  -                return m_repository.getLocalAppliance( name );
  +                return getLocalAppliance( name );
               }
               else if( j == 0 )
               {
  -                return m_repository.getLocalAppliance( name.substring( 1 ) );
  +                return getLocalAppliance( name.substring( 1 ) );
               }
               else
               {
                   final String root = name.substring( 0, j );
  -                Appliance child = m_repository.getLocalAppliance( root );
  +                Appliance child = getLocalAppliance( root );
                   if( child instanceof Engine )
                   {
                       return ((Engine)child).locate( path );
  @@ -361,7 +374,7 @@
                   else
                   {
                       final String error = "Not a container: " + path;
  -                    throw new ApplianceException( error );
  +                    throw new IllegalArgumentException( error );
                   }
               }
           }
  @@ -394,9 +407,18 @@
                   // its a relative reference
                   //
   
  -                return m_repository.getLocalAppliance( path );
  +                return getLocalAppliance( path );
               }
           }
  +    }
  +
  +    private Appliance getLocalAppliance( final String name )
  +      throws IllegalArgumentException
  +    {
  +        Appliance appliance = m_repository.getLocalAppliance( name );
  +        if( appliance != null ) return appliance;
  +        final String error = "Unknown name: [" + name + "]";
  +        throw new IllegalArgumentException( error );
       }
   
       //-------------------------------------------------------------------
  
  
  
  1.5       +5 -5      avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
  
  Index: ContainmentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainmentModel.java	28 Oct 2003 12:53:48 -0000	1.4
  +++ ContainmentModel.java	22 Nov 2003 12:52:55 -0000	1.5
  @@ -111,19 +111,19 @@
      /**
       * Return a model relative to a supplied dependency.
       * @return a matching model or null if the dependency is unresolvable
  -    * @exception ModelException if an error occurs during model establishment
  +    * @exception ModelRuntimeException if an error occurs during model establishment
       */
       Model getModel( DependencyDescriptor dependency ) 
  -      throws ModelException;
  +      throws ModelRuntimeException;
   
      /**
       * Return a model relative to a supplied stage descriptor.
       * @param stage the stage descriptor
       * @return model of a an stage handler or null if the stage is unresolvable
  -    * @exception ModelException if an error occurs during model establishment
  +    * @exception ModelRuntimeException if an error occurs during model establishment
       */
       Model getModel( StageDescriptor stage ) 
  -      throws ModelException;
  +      throws ModelRuntimeException;
   
      /**
       * Addition of a new subsidiary model within
  
  
  
  1.5       +1 -1      avalon/merlin/composition/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	3 Nov 2003 23:57:29 -0000	1.4
  +++ project.xml	22 Nov 2003 12:52: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.2-dev</currentVersion>
  +  <currentVersion>1.2.1-dev</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Composition Framework.</shortDescription>
  
  
  
  1.6       +9 -7      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
  
  Index: DefaultContainmentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultContainmentModel.java	28 Oct 2003 20:21:00 -0000	1.5
  +++ DefaultContainmentModel.java	22 Nov 2003 12:52:55 -0000	1.6
  @@ -80,6 +80,7 @@
   import org.apache.avalon.composition.model.DeploymentModel;
   import org.apache.avalon.composition.model.Model;
   import org.apache.avalon.composition.model.ModelException;
  +import org.apache.avalon.composition.model.ModelRuntimeException;
   import org.apache.avalon.composition.model.ModelSelector;
   import org.apache.avalon.composition.model.ProfileSelector;
   import org.apache.avalon.composition.model.TypeRepository;
  @@ -831,9 +832,10 @@
      /**
       * Get a local model relative to a supplied service dependency.
       * @param dependency the service dependency descriptor
  -    * @exception ModelException if an error occurs during model creation
  +    * @exception ModelRuntimeException if an error occurs during model establishment
       */
  -    public Model getModel( DependencyDescriptor dependency ) throws ModelException
  +    public Model getModel( DependencyDescriptor dependency )
  +      throws ModelRuntimeException
       {
           //
           // if an existing model exists return it
  @@ -886,7 +888,7 @@
                   "containment.model.create.error", 
                   getPath(), 
                   dependency.toString() );
  -            throw new ModelException( error, e );
  +            throw new ModelRuntimeException( error, e );
           }
       }
   
  @@ -894,10 +896,10 @@
       * Return a model relative to a supplied stage descriptor.
       * @param stage the stage descriptor
       * @return model of a an stage handler or null if the stage is unresolvable
  -    * @exception ModelException if an error occurs during model establishment
  +    * @exception ModelRuntimeException if an error occurs during model establishment
       */
       public Model getModel( StageDescriptor stage ) 
  -      throws ModelException
  +      throws ModelRuntimeException
       {
           //
           // if an existing model exists return it
  @@ -951,7 +953,7 @@
                   "containment.model.create.error", 
                   getPath(), 
                   stage.toString() );
  -            throw new ModelException( error, e );
  +            throw new ModelRuntimeException( error, e );
           }
       }
   
  
  
  
  1.7       +3 -2      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
  
  Index: DefaultDeploymentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultDeploymentModel.java	3 Nov 2003 06:11:30 -0000	1.6
  +++ DefaultDeploymentModel.java	22 Nov 2003 12:52:55 -0000	1.7
  @@ -70,6 +70,7 @@
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.composition.data.ContextDirective;
   import org.apache.avalon.composition.data.Mode;
  @@ -437,7 +438,7 @@
       */
       public boolean isParameterizable()
       {
  -        return Parameters.class.isAssignableFrom( getDeploymentClass() );
  +        return Parameterizable.class.isAssignableFrom( getDeploymentClass() );
       }
   
      /**
  
  
  
  1.11      +1 -1      avalon/merlin/kernel/bootstrap/src/etc/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/etc/merlin.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- merlin.properties	10 Nov 2003 19:13:58 -0000	1.10
  +++ merlin.properties	22 Nov 2003 12:52:55 -0000	1.11
  @@ -29,7 +29,7 @@
   merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5
   merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.2.1-dev
   merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
  -merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
  +merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2.1-dev
   merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
   merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
   merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
  
  
  
  1.9       +42 -1     avalon/merlin/kernel/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	3 Nov 2003 23:57:29 -0000	1.8
  +++ project.xml	22 Nov 2003 12:52:55 -0000	1.9
  @@ -38,6 +38,9 @@
         <groupId>merlin</groupId>
         <artifactId>merlin-kernel-spi</artifactId>
         <version>3.2-dev</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
   
       <!-- avalon dependecies -->
  @@ -46,11 +49,17 @@
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-api</artifactId>
         <version>1.2-dev</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
         <artifactId>avalon-activation-spi</artifactId>
         <version>1.2.1-dev</version>
  +      <properties>
  +        <avalon.classloader>spi</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-activation</groupId>
  @@ -62,6 +71,9 @@
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
         <version>1.1-dev</version>
  +      <properties>
  +        <avalon.classloader>spi</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-repository</groupId>
  @@ -73,27 +85,39 @@
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
         <version>1.2-dev</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-spi</artifactId>
         <version>1.2-dev</version>
  +      <properties>
  +        <avalon.classloader>spi</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2-dev</version>
  +      <version>1.2.1-dev</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-api</artifactId>
         <version>1.2.1-dev</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-spi</artifactId>
         <version>1.2.1-dev</version>
  +      <properties>
  +        <avalon.classloader>spi</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
  @@ -105,6 +129,9 @@
         <groupId>avalon-extension</groupId>
         <artifactId>avalon-extension-spi</artifactId>
         <version>1.0</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-extension</groupId>
  @@ -116,6 +143,9 @@
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
         <version>4.1.5</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
  @@ -143,6 +173,9 @@
         <groupId>excalibur-lifecycle</groupId>
         <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <id>excalibur-i18n</id>
  @@ -166,6 +199,8 @@
   
       <!-- commons dependencies -->
   
  +    <!--
  +    -->
       <dependency>
         <id>commons-cli</id>
         <version>1.0</version>
  @@ -181,11 +216,17 @@
       <dependency>
         <id>xml-apis</id>
         <version>2.0.2</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xmlParserAPIs</artifactId>
         <version>2.0.2</version>
  +      <properties>
  +        <avalon.classloader>api</avalon.classloader>
  +      </properties>
       </dependency>
       <dependency>
         <id>xerces</id>
  
  
  
  1.10      +1 -1      avalon/merlin/kernel/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	3 Nov 2003 23:57:29 -0000	1.9
  +++ project.xml	22 Nov 2003 12:52:55 -0000	1.10
  @@ -67,7 +67,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-impl</artifactId>
  -      <version>1.2-dev</version>
  +      <version>1.2.1-dev</version>
       </dependency>
   
       <dependency>
  
  
  
  1.9       +1 -1      avalon/merlin/kernel/unit/src/etc/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/unit/src/etc/merlin.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- merlin.properties	3 Nov 2003 23:57:29 -0000	1.8
  +++ merlin.properties	22 Nov 2003 12:52:55 -0000	1.9
  @@ -29,7 +29,7 @@
   merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5
   merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.2.1-dev
   merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
  -merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
  +merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2.1-dev
   merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
   merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
   merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
  
  
  
  1.7       +1 -1      avalon/merlin/platform/tutorials/hello/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	13 Nov 2003 01:56:42 -0000	1.6
  +++ project.xml	22 Nov 2003 12:52:55 -0000	1.7
  @@ -7,7 +7,7 @@
     <id>hello</id>
     <name>Merlin Hello Tutorials</name>
     <package>tutorial</package>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.1</currentVersion>
   
     <inceptionYear>2003</inceptionYear>
     <shortDescription>Merlin Hello Tutorial</shortDescription>
  
  
  
  1.3       +7 -1      avalon/merlin/platform/tutorials/hello/src/java/tutorial/HelloComponent.java
  
  Index: HelloComponent.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/src/java/tutorial/HelloComponent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HelloComponent.java	13 Oct 2003 14:13:17 -0000	1.2
  +++ HelloComponent.java	22 Nov 2003 12:52:55 -0000	1.3
  @@ -67,10 +67,16 @@
    * that all lifecycle stages are optional.
    *
    * @avalon.component version="1.0" name="hello" lifestyle="singleton"
  + * @avalon.service type="tutorial.Hello"
    */
   public class HelloComponent 
  -  implements LogEnabled, Initializable, Executable, Disposable
  +  implements LogEnabled, Initializable, Executable, Disposable, Hello
   {
  +
  +    public void sayHello()
  +    {
  +        getLogger().info( "HELLO" );
  +    }
   
      /**
       * Internal reference to the logging channel supplied to us 
  
  
  

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


Mime
View raw message