avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl DefaultBlock.java
Date Mon, 31 Mar 2003 18:52:22 GMT
bloritsch    2003/03/31 10:52:22

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/appliance
                        DefaultAppliance.java
               merlin/assembly/src/test/org/apache/avalon/playground
                        ComplexComponent.java SimpleComponent.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        DefaultBlock.java
  Log:
  fix some style issues--Statics should be accessed as Statics
  
  Revision  Changes    Path
  1.4       +16 -23    avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultAppliance.java	29 Mar 2003 03:25:56 -0000	1.3
  +++ DefaultAppliance.java	31 Mar 2003 18:52:22 -0000	1.4
  @@ -51,40 +51,32 @@
   package org.apache.avalon.assembly.appliance;
   
   import java.io.File;
  -import java.util.Map;
  +import java.net.URL;
   import java.util.ArrayList;
   import java.util.Hashtable;
  -import java.net.URL;
  -
  -import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.context.DefaultContext;
  +import java.util.Map;
   
  -import org.apache.avalon.assembly.engine.Engine;
   import org.apache.avalon.assembly.engine.EngineClassLoader;
   import org.apache.avalon.assembly.engine.RepositoryManager;
  -import org.apache.avalon.assembly.lifestyle.LifestyleException;
  -import org.apache.avalon.assembly.lifestyle.LifestyleService;
   import org.apache.avalon.assembly.lifestyle.LifestyleHandler;
  -import org.apache.avalon.assembly.locator.Locator;
  +import org.apache.avalon.assembly.lifestyle.LifestyleService;
   import org.apache.avalon.assembly.locator.Contextualizable;
  +import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.LocatorException;
  +import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.context.Context;
  +import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.context.DefaultContext;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.meta.info.ContextDescriptor;
   import org.apache.avalon.meta.info.DependencyDescriptor;
  -import org.apache.avalon.meta.info.LoggerDescriptor;
  -import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
  +import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.model.ContextDirective;
   import org.apache.avalon.meta.model.LoggingDirective;
  -import org.apache.avalon.meta.model.Profile;
   
   
   /**
  @@ -150,7 +142,8 @@
   
       protected static String PROTOCOL = "native";
   
  -    private static final ContextBuilder BUILDER = new ContextBuilder();
  +    // NEVER USED!
  +    //private static final ContextBuilder BUILDER = new ContextBuilder();
   
       //=====================================================================
       // state
  @@ -730,7 +723,7 @@
               Context source = new DefaultContext( map, m_system );
               ContextDirective directive = m_applianceContext.getContextDirective();
               RepositoryManager repository = m_engine.getRepository();
  -            return BUILDER.buildContextMap( 
  +            return ContextBuilder.buildContextMap( 
                 m_engine, repository, descriptor, directive, source );
           }
           catch( Throwable e )
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexComponent.java
  
  Index: ComplexComponent.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexComponent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComplexComponent.java	13 Mar 2003 01:04:24 -0000	1.1
  +++ ComplexComponent.java	31 Mar 2003 18:52:22 -0000	1.2
  @@ -80,7 +80,7 @@
       private SimpleService m_simple;
       private BasicService m_basic;
       private Thread m_thread;
  -    private boolean m_continue = false;
  +    protected boolean m_continue = false;
   
       //=================================================================
       // Serviceable
  @@ -172,7 +172,7 @@
                       {
                           try
                           {
  -                            Thread.currentThread().sleep( 100 );
  +                            Thread.sleep( 100 );
                           }
                           catch( Throwable e )
                           {
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.java
  
  Index: SimpleComponent.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleComponent.java	13 Mar 2003 01:04:27 -0000	1.1
  +++ SimpleComponent.java	31 Mar 2003 18:52:22 -0000	1.2
  @@ -80,7 +80,7 @@
       private String m_message;
       private BasicService m_basic;
       private Thread m_thread;
  -    private boolean m_continuation = false;
  +    protected boolean m_continuation = false;
   
       //=======================================================================
       // Configurable
  @@ -181,7 +181,7 @@
                       {
                           try
                           {
  -                            Thread.currentThread().sleep( 100 );
  +                            Thread.sleep( 100 );
                           }
                           catch( Throwable e )
                           {
  
  
  
  1.4       +12 -34    avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java
  
  Index: DefaultBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultBlock.java	18 Mar 2003 05:05:02 -0000	1.3
  +++ DefaultBlock.java	31 Mar 2003 18:52:22 -0000	1.4
  @@ -2,58 +2,35 @@
   
   package org.apache.avalon.merlin.block.impl;
   
  -import java.io.File;
  -import java.io.IOException;
   import java.net.URL;
  -import java.util.List;
  -import java.util.Iterator;
   import java.util.ArrayList;
  -import java.util.jar.Attributes;
  -import java.util.jar.Manifest;
  -import java.util.jar.JarFile;
  -import java.util.Map;
   import java.util.Hashtable;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
   
   import org.apache.avalon.assembly.appliance.Appliance;
  -import org.apache.avalon.assembly.appliance.DefaultAppliance;
   import org.apache.avalon.assembly.appliance.ApplianceContext;
  -import org.apache.avalon.assembly.appliance.ApplianceRepository;
   import org.apache.avalon.assembly.appliance.ApplianceException;
  +import org.apache.avalon.assembly.appliance.ApplianceRepository;
  +import org.apache.avalon.assembly.appliance.DefaultAppliance;
  +import org.apache.avalon.assembly.appliance.DefaultApplianceContext;
   import org.apache.avalon.assembly.appliance.DependencyGraph;
   import org.apache.avalon.assembly.engine.EngineClassLoader;
   import org.apache.avalon.assembly.locator.Locator;
  -import org.apache.avalon.assembly.locator.Contextualizable;
  -import org.apache.avalon.assembly.lifestyle.LifestyleException;
  -import org.apache.avalon.assembly.lifestyle.LifestyleService;
   import org.apache.avalon.assembly.util.ExceptionHelper;
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.DefaultConfiguration;
  +import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.merlin.block.Block;
   import org.apache.avalon.merlin.block.BlockException;
   import org.apache.avalon.merlin.block.Library;
  -import org.apache.avalon.merlin.container.impl.DefaultContainer;
  -import org.apache.avalon.merlin.container.ContainerDescriptor;
   import org.apache.avalon.merlin.container.Container;
  -import org.apache.avalon.merlin.container.StateListener;
  +import org.apache.avalon.merlin.container.ContainerDescriptor;
   import org.apache.avalon.merlin.container.StateEvent;
  -import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.info.builder.XMLTypeCreator;
  -import org.apache.avalon.meta.info.StageDescriptor;
  +import org.apache.avalon.merlin.container.StateListener;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
  -import org.apache.avalon.meta.model.builder.XMLProfileCreator;
   import org.apache.avalon.meta.model.Profile;
  -import org.apache.avalon.merlin.kernel.impl.DefaultKernel;
  -import org.apache.avalon.assembly.appliance.DefaultApplianceContext;
  -import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
    * The default implementation of a Block.  The implementation provides 
  @@ -178,7 +155,8 @@
       * List of the commonents that have been established explicity by the 
       * block during deployment.
       */
  -    private Map m_components = new Hashtable();
  +    // NEVER USED!
  +    //private Map m_components = new Hashtable();
   
      /**
       * Flag holding the deoplyed state of the block.
  @@ -951,7 +929,7 @@
       {
           try
           {
  -            Thread.currentThread().sleep( 100 );
  +            Thread.sleep( 100 );
           }
           catch( Throwable wakeup )
           {
  
  
  

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


Mime
View raw message