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/impl/src/java/org/apache/avalon/activation/appliance/impl DefaultAppliance.java DefaultBlock.java DefaultServiceManager.java
Date Wed, 22 Oct 2003 01:45:37 GMT
mcconnell    2003/10/21 18:45:37

  Modified:    merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
                        DefaultAppliance.java DefaultBlock.java
                        DefaultServiceManager.java
  Log:
  Applying patches on imports and exception handling from Alex.
  
  Revision  Changes    Path
  1.9       +1 -5      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultAppliance.java	19 Oct 2003 14:05:10 -0000	1.8
  +++ DefaultAppliance.java	22 Oct 2003 01:45:37 -0000	1.9
  @@ -88,13 +88,9 @@
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.parameters.Parameterizable;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.lifecycle.Accessor;
  
  
  
  1.5       +2 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultBlock.java	18 Oct 2003 00:34:19 -0000	1.4
  +++ DefaultBlock.java	22 Oct 2003 01:45:37 -0000	1.5
  @@ -71,7 +71,6 @@
   import org.apache.avalon.activation.appliance.Engine;
   import org.apache.avalon.activation.appliance.NoProviderDefinitionException;
   import org.apache.avalon.activation.appliance.ServiceContext;
  -import org.apache.avalon.composition.data.ContextDirective;
   import org.apache.avalon.composition.data.CategoriesDirective;
   import org.apache.avalon.composition.data.ServiceDirective;
   import org.apache.avalon.composition.model.ContainmentModel;
  @@ -597,7 +596,7 @@
                       {
                           try
                           {
  -                            Thread.currentThread().sleep( 300 );
  +                            Thread.sleep( 300 );
                           }
                           catch( Throwable e )
                           {
  
  
  
  1.4       +1 -1      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java
  
  Index: DefaultServiceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultServiceManager.java	18 Oct 2003 00:34:19 -0000	1.3
  +++ DefaultServiceManager.java	22 Oct 2003 01:45:37 -0000	1.4
  @@ -163,7 +163,7 @@
   
               final String error = 
                 "Unexpected runtime error while attempting to resolve service for key: "
+ key;
  -            throw new ServiceException( error, e );
  +            throw new ServiceException( key, error, e );
           }
       }
   
  
  
  

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


Mime
View raw message