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/activation/spi/src/java/org/apache/avalon/activation/appliance Block.java
Date Tue, 07 Oct 2003 17:42:55 GMT
mcconnell    2003/10/07 10:42:55

  Modified:    merlin/activation/impl project.xml
               merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
                        DefaultBlock.java
               merlin/activation/spi/src/java/org/apache/avalon/activation/appliance
                        Block.java
  Log:
  Correct bug in handling path resolution when dealing with root element matching.
  
  Revision  Changes    Path
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:30:31 -0000	1.1
  +++ project.xml	7 Oct 2003 17:42:55 -0000	1.2
  @@ -8,7 +8,7 @@
     <id>avalon-activation-impl</id>
     <name>Avalon Activation Framework</name>
     <package>org.apache.avalon.activation</package>
  -  <currentVersion>1.0b1</currentVersion>
  +  <currentVersion>1.0b2</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Runtime activation framework.</shortDescription>
  
  
  
  1.2       +5 -3      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java
  
  Index: DefaultBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultBlock.java	24 Sep 2003 09:30:42 -0000	1.1
  +++ DefaultBlock.java	7 Oct 2003 17:42:55 -0000	1.2
  @@ -71,6 +71,7 @@
   import org.apache.avalon.activation.appliance.ServiceContext;
   import org.apache.avalon.activation.appliance.NoProviderDefinitionException;
   import org.apache.avalon.activation.appliance.DeploymentException;
  +import org.apache.avalon.activation.appliance.UnknownServiceException;
   import org.apache.avalon.composition.data.ContextDirective;
   import org.apache.avalon.composition.data.CategoriesDirective;
   import org.apache.avalon.composition.data.ServiceDirective;
  @@ -84,6 +85,7 @@
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.Version;
   import org.apache.avalon.meta.info.ExtensionDescriptor;
   import org.apache.avalon.meta.info.InfoDescriptor;
   import org.apache.avalon.meta.info.DependencyDescriptor;
  @@ -377,7 +379,7 @@
         throws Exception
       {
           String path = source;
  -        if( source.endsWith( "/" ))
  +        if(( source.length() > 1 ) && source.endsWith( "/" ))
           {
               path = source.substring( 0, source.length() -1 );
           }
  @@ -439,7 +441,7 @@
                   }
                   else
                   {
  -                    final String error = "Invalid absolute reference: " + path;
  +                    final String error = "Invalid absolute reference: [" + path + "]";
                       throw new IllegalArgumentException( error );
                   }
               }
  
  
  
  1.2       +2 -1      avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Block.java
  
  Index: Block.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Block.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Block.java	24 Sep 2003 09:30:57 -0000	1.1
  +++ Block.java	7 Oct 2003 17:42:55 -0000	1.2
  @@ -50,6 +50,7 @@
   
   package org.apache.avalon.activation.appliance;
   
  +
   /**
    * A block is an appliance that manages a set of subsidiary 
    * appliance instances.
  
  
  

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


Mime
View raw message