avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel Kernel.java
Date Thu, 12 Jun 2003 18:56:21 GMT
cziegeler    2003/06/12 11:56:21

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl
                        DefaultDeploymentService.java
                        AvalonContextualizer.java
                        DefaultContextualizer.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        Targets.java ContainmentProfile.java
                        StandardBlock.java Target.java
                        XMLContainerCreator.java ContainerCreator.java
                        StandardBlockLoader.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernelLoader.java DefaultKernel.java
               merlin/merlin-spi/src/java/org/apache/avalon/merlin/container
                        Container.java
               merlin/meta/src/java/org/apache/avalon/meta/model/builder
                        XMLProfileCreator.java
               merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags
                        AbstractTag.java
               merlin/merlin-extensions/merlin-jndi/src/java/org/apache/avalon/merlin/jndi
                        ServiceFactory.java
               merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
                        DefaultAppliance.java
               merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
                        EngineConfigurationHelper.java
               merlin/assembly-spi/src/java/org/apache/avalon/assembly/repository
                        TransportException.java
               merlin/meta-spi/src/java/org/apache/avalon/meta/model
                        Profile.java
               merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools
                        MerlinBean.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl
                        DefaultContainer.java
               merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator
                        Resolvable.java
               merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel
                        Kernel.java
  Log:
  Organizing imports
  
  Revision  Changes    Path
  1.12      +6 -8      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultDeploymentService.java
  
  Index: DefaultDeploymentService.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultDeploymentService.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultDeploymentService.java	9 Jun 2003 01:00:07 -0000	1.11
  +++ DefaultDeploymentService.java	12 Jun 2003 18:56:19 -0000	1.12
  @@ -54,28 +54,26 @@
   import org.apache.avalon.assembly.lifecycle.DeploymentException;
   import org.apache.avalon.assembly.lifecycle.DeploymentService;
   import org.apache.avalon.assembly.locator.Contextualizable;
  -
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
   import org.apache.avalon.assembly.logging.LoggingManager;
  -import org.apache.avalon.framework.activity.Executable;
   import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.activity.Executable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  +import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.lifecycle.Creator;
   import org.apache.avalon.meta.info.StageDescriptor;
  -import org.apache.avalon.meta.info.LoggerDescriptor;
   import org.apache.avalon.meta.model.LoggingDirective;
   import org.apache.excalibur.configuration.ConfigurationUtil;
   
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/AvalonContextualizer.java
  
  Index: AvalonContextualizer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/AvalonContextualizer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AvalonContextualizer.java	4 Jun 2003 09:28:44 -0000	1.2
  +++ AvalonContextualizer.java	12 Jun 2003 18:56:19 -0000	1.3
  @@ -62,7 +62,6 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.meta.model.ContextDirective;
  -import org.apache.avalon.assembly.lifecycle.Contextualization;
   
   /**
    * Definition of an strategy handler that handles the Contextualization
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultContextualizer.java
  
  Index: DefaultContextualizer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultContextualizer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultContextualizer.java	4 Jun 2003 09:28:44 -0000	1.2
  +++ DefaultContextualizer.java	12 Jun 2003 18:56:19 -0000	1.3
  @@ -57,7 +57,6 @@
   
   import java.util.Map;
   
  -import org.apache.avalon.assembly.lifecycle.Contextualization;
   import org.apache.avalon.assembly.locator.Contextualizable;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
  
  
  
  1.2       +1 -11     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/Targets.java
  
  Index: Targets.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/Targets.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Targets.java	29 Apr 2003 21:07:36 -0000	1.1
  +++ Targets.java	12 Jun 2003 18:56:19 -0000	1.2
  @@ -57,16 +57,6 @@
   
   import java.util.ArrayList;
   
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.info.DependencyDescriptor;
  -import org.apache.avalon.meta.info.ServiceDescriptor;
  -import org.apache.avalon.meta.model.ContextDirective;
  -import org.apache.avalon.meta.model.LoggingDirective;
  -import org.apache.avalon.meta.model.Mode;
  -import org.apache.avalon.meta.model.Profile;
  -
   /**
    * <p>A target is a tagged configuration fragment.  The tag is a path
    * seperated by "/" charaters qualifying the component that the target
  
  
  
  1.3       +1 -7      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/ContainmentProfile.java
  
  Index: ContainmentProfile.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/ContainmentProfile.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainmentProfile.java	9 Jun 2003 01:04:29 -0000	1.2
  +++ ContainmentProfile.java	12 Jun 2003 18:56:19 -0000	1.3
  @@ -58,17 +58,11 @@
   import java.util.ArrayList;
   
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
  -import org.apache.avalon.meta.model.ContextDirective;
  -import org.apache.avalon.meta.model.LoggingDirective;
   import org.apache.avalon.meta.model.Mode;
   import org.apache.avalon.meta.model.Profile;
   
  
  
  
  1.10      +2 -11     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.java
  
  Index: StandardBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StandardBlock.java	9 Jun 2003 01:05:34 -0000	1.9
  +++ StandardBlock.java	12 Jun 2003 18:56:19 -0000	1.10
  @@ -52,35 +52,26 @@
   
   import java.lang.reflect.Proxy;
   import java.net.URL;
  -import java.util.Arrays;
   import java.util.ArrayList;
   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.ApplianceContext;
   import org.apache.avalon.assembly.appliance.ApplianceException;
  -import org.apache.avalon.assembly.appliance.ApplianceResolver;
   import org.apache.avalon.assembly.appliance.ApplianceRepository;
  +import org.apache.avalon.assembly.appliance.ApplianceResolver;
  +import org.apache.avalon.assembly.appliance.DependencyGraph;
   import org.apache.avalon.assembly.appliance.impl.DefaultAppliance;
   import org.apache.avalon.assembly.appliance.impl.DefaultApplianceContext;
  -import org.apache.avalon.assembly.appliance.DependencyGraph;
   import org.apache.avalon.assembly.engine.Engine;
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.LocatorException;
  -import org.apache.avalon.assembly.locator.Contextualizable;
  -import org.apache.avalon.assembly.util.ExceptionHelper;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.merlin.block.Block;
   import org.apache.avalon.merlin.block.BlockException;
  -import org.apache.avalon.merlin.container.Container;
  -import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.model.Profile;
  
  
  
  1.2       +1 -12     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/Target.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Target.java	29 Apr 2003 21:07:36 -0000	1.1
  +++ Target.java	12 Jun 2003 18:56:19 -0000	1.2
  @@ -55,18 +55,7 @@
   
   package org.apache.avalon.merlin.block.impl;
   
  -import java.util.ArrayList;
  -
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.info.DependencyDescriptor;
  -import org.apache.avalon.meta.info.ServiceDescriptor;
  -import org.apache.avalon.meta.model.ContextDirective;
  -import org.apache.avalon.meta.model.LoggingDirective;
  -import org.apache.avalon.meta.model.Mode;
  -import org.apache.avalon.meta.model.Profile;
  -import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
    * <p>A target is a tagged configuration fragment.  The tag is a path
  
  
  
  1.2       +8 -17     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/XMLContainerCreator.java
  
  Index: XMLContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/XMLContainerCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLContainerCreator.java	29 Apr 2003 21:07:36 -0000	1.1
  +++ XMLContainerCreator.java	12 Jun 2003 18:56:19 -0000	1.2
  @@ -56,50 +56,41 @@
   package org.apache.avalon.merlin.block.impl;
   
   import java.io.InputStream;
  +import java.net.JarURLConnection;
  +import java.net.MalformedURLException;
   import java.net.URL;
  -import java.lang.reflect.Array;
  -import java.util.Arrays;
   import java.util.ArrayList;
   import java.util.jar.JarFile;
   import java.util.zip.ZipEntry;
  -import java.net.JarURLConnection;
  -import java.net.MalformedURLException;
   
  -import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.engine.impl.DefaultClasspath;
  +import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.engine.impl.EngineConfigurationHelper;
  -import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
   import org.apache.avalon.assembly.engine.model.Classpath;
  +import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
   import org.apache.avalon.assembly.engine.model.FilesetDescriptor;
   import org.apache.avalon.assembly.engine.model.IncludeDescriptor;
   import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
   import org.apache.avalon.assembly.engine.type.UnknownTypeException;
   import org.apache.avalon.assembly.repository.Repository;
  -import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  +import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.merlin.container.ContainerException;
   import org.apache.avalon.merlin.container.ContainerRuntimeException;
   import org.apache.avalon.merlin.container.impl.DefaultContainer;
  -import org.apache.avalon.meta.ConfigurationBuilder;
  -import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.DependencyDescriptor;
  +import org.apache.avalon.meta.info.ServiceDescriptor;
  +import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.builder.XMLTypeCreator;
  -import org.apache.avalon.meta.model.Category;
   import org.apache.avalon.meta.model.ContextDirective;
  -import org.apache.avalon.meta.model.Entry;
  -import org.apache.avalon.meta.model.Import;
   import org.apache.avalon.meta.model.LoggingDirective;
   import org.apache.avalon.meta.model.Mode;
   import org.apache.avalon.meta.model.Profile;
   import org.apache.avalon.meta.model.builder.XMLProfileCreator;
   import org.apache.excalibur.configuration.ConfigurationUtil;
  -
  -import org.xml.sax.InputSource;
   
   /**
    * Handles internalization of an XML based description of a {@link Profile}
  
  
  
  1.2       +2 -3      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/ContainerCreator.java
  
  Index: ContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/ContainerCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerCreator.java	29 Apr 2003 21:07:35 -0000	1.1
  +++ ContainerCreator.java	12 Jun 2003 18:56:19 -0000	1.2
  @@ -56,12 +56,11 @@
   package org.apache.avalon.merlin.block.impl;
   
   import java.net.URL;
  -import java.io.InputStream;
   
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.DependencyDescriptor;
  +import org.apache.avalon.meta.info.Type;
   
   /**
    * Simple interface used to create {@link ContainmentProfile}
  
  
  
  1.11      +2 -9      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java
  
  Index: StandardBlockLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StandardBlockLoader.java	9 Jun 2003 18:04:31 -0000	1.10
  +++ StandardBlockLoader.java	12 Jun 2003 18:56:19 -0000	1.11
  @@ -55,9 +55,7 @@
   import java.net.JarURLConnection;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.ArrayList;
   import java.util.Hashtable;
  -import java.util.List;
   import java.util.Map;
   import java.util.Properties;
   import java.util.jar.JarFile;
  @@ -65,8 +63,8 @@
   
   import org.apache.avalon.assembly.appliance.impl.DefaultApplianceContext;
   import org.apache.avalon.assembly.engine.EngineException;
  -import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.engine.impl.DefaultClasspath;
  +import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.engine.model.Classpath;
   import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
   import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
  @@ -89,13 +87,8 @@
   import org.apache.avalon.merlin.block.BlockException;
   import org.apache.avalon.merlin.block.BlockRuntimeException;
   import org.apache.avalon.merlin.container.Container;
  -import org.apache.avalon.merlin.block.impl.Target;
  -import org.apache.avalon.merlin.block.impl.Targets;
   import org.apache.avalon.merlin.container.ContainerException;
  -import org.apache.avalon.merlin.block.impl.VirtualService;
  -import org.apache.avalon.merlin.block.impl.XMLContainerCreator;
   import org.apache.avalon.merlin.container.impl.DefaultContainer;
  -import org.apache.avalon.merlin.kernel.Kernel;
   import org.apache.avalon.merlin.kernel.KernelLoader;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.InfoDescriptor;
  
  
  
  1.9       +0 -2      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelLoader.java
  
  Index: DefaultKernelLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultKernelLoader.java	11 Jun 2003 05:15:48 -0000	1.8
  +++ DefaultKernelLoader.java	12 Jun 2003 18:56:20 -0000	1.9
  @@ -7,7 +7,6 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.util.Map;
  -import java.util.Hashtable;
   
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
   import org.apache.avalon.assembly.util.ExceptionHelper;
  @@ -18,7 +17,6 @@
   import org.apache.avalon.merlin.kernel.Kernel;
   import org.apache.avalon.merlin.kernel.KernelException;
   import org.apache.avalon.merlin.kernel.KernelLoader;
  -
   import org.xml.sax.SAXException;
   
   /**
  
  
  
  1.19      +5 -6      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DefaultKernel.java	9 Jun 2003 01:06:38 -0000	1.18
  +++ DefaultKernel.java	12 Jun 2003 18:56:20 -0000	1.19
  @@ -58,13 +58,12 @@
   import org.apache.avalon.assembly.locator.Contextualizable;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
  -import org.apache.avalon.assembly.logging.impl.DefaultLoggingManager;
   import org.apache.avalon.assembly.logging.LoggingDescriptor;
   import org.apache.avalon.assembly.logging.LoggingManager;
  -import org.apache.avalon.assembly.logging.impl.FileTargetProvider;
  -import org.apache.avalon.assembly.logging.LoggingDescriptor;
   import org.apache.avalon.assembly.logging.TargetDescriptor;
   import org.apache.avalon.assembly.logging.TargetProvider;
  +import org.apache.avalon.assembly.logging.impl.DefaultLoggingManager;
  +import org.apache.avalon.assembly.logging.impl.FileTargetProvider;
   import org.apache.avalon.assembly.repository.Repository;
   import org.apache.avalon.assembly.repository.impl.FileRepository;
   import org.apache.avalon.assembly.util.ExceptionHelper;
  @@ -81,12 +80,12 @@
   import org.apache.avalon.merlin.block.Block;
   import org.apache.avalon.merlin.block.impl.StandardBlockLoader;
   import org.apache.avalon.merlin.container.Container;
  -import org.apache.avalon.meta.model.builder.XMLProfileCreator;
   import org.apache.avalon.merlin.kernel.Kernel;
   import org.apache.avalon.merlin.kernel.KernelException;
   import org.apache.avalon.merlin.kernel.KernelLoader;
   import org.apache.avalon.meta.model.Category;
   import org.apache.avalon.meta.model.LoggingDirective;
  +import org.apache.avalon.meta.model.builder.XMLProfileCreator;
   import org.apache.excalibur.event.command.CommandManager;
   import org.apache.excalibur.event.command.TPCThreadManager;
   import org.apache.excalibur.mpool.DefaultPoolManager;
  @@ -663,7 +662,7 @@
   
           if( getLogger().isInfoEnabled() )
           {
  -            int n = Thread.currentThread().activeCount();
  +            int n = Thread.activeCount();
               getLogger().info( "bye (" + n + ")" );
           }
       }
  
  
  
  1.5       +1 -2      avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/container/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/container/Container.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Container.java	29 Apr 2003 21:07:36 -0000	1.4
  +++ Container.java	12 Jun 2003 18:56:20 -0000	1.5
  @@ -55,7 +55,6 @@
   
   package org.apache.avalon.merlin.container;
   
  -import org.apache.avalon.framework.Version;
   
   /**
    * <p>A container is node in a containment heirachy.</p>
  
  
  
  1.5       +4 -14     avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java
  
  Index: XMLProfileCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLProfileCreator.java	30 May 2003 10:21:04 -0000	1.4
  +++ XMLProfileCreator.java	12 Jun 2003 18:56:20 -0000	1.5
  @@ -51,10 +51,10 @@
   package org.apache.avalon.meta.model.builder;
   
   import java.io.InputStream;
  +import java.lang.reflect.Array;
  +import java.lang.reflect.Constructor;
   import java.util.ArrayList;
   import java.util.Vector;
  -import java.lang.reflect.Constructor;
  -import java.lang.reflect.Array;
   
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  @@ -63,20 +63,10 @@
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.meta.model.ModelRuntimeException;
  -import org.apache.avalon.meta.model.LoggingDirective;
  -import org.apache.avalon.meta.model.Category;
  -import org.apache.avalon.meta.model.ContextDirective;
  -import org.apache.avalon.meta.model.Entry;
  -import org.apache.avalon.meta.model.Import;
  -import org.apache.avalon.meta.model.Parameter;
  -import org.apache.avalon.meta.model.Profile;
  -import org.apache.avalon.meta.model.Mode;
   import org.apache.avalon.meta.ConfigurationBuilder;
  -import org.apache.avalon.meta.info.DependencyDescriptor;
  -import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.builder.XMLTypeCreator;
  +import org.apache.avalon.meta.model.*;
   import org.apache.excalibur.configuration.CascadingConfiguration;
   import org.xml.sax.InputSource;
   
  
  
  
  1.7       +5 -5      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java
  
  Index: AbstractTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractTag.java	4 Jun 2003 09:28:45 -0000	1.6
  +++ AbstractTag.java	12 Jun 2003 18:56:20 -0000	1.7
  @@ -50,14 +50,14 @@
   package org.apache.avalon.meta.info.builder.tags;
   
   
  +import java.util.ArrayList;
  +import java.util.List;
  +
   import com.thoughtworks.qdox.model.DocletTag;
   import com.thoughtworks.qdox.model.JavaClass;
   import com.thoughtworks.qdox.model.JavaMethod;
   import com.thoughtworks.qdox.model.Type;
  -import java.util.ArrayList;
  -import java.util.HashSet;
  -import java.util.List;
  -import java.util.Set;
  +
   import org.apache.avalon.framework.Version;
   
   /**
  
  
  
  1.4       +12 -9     avalon-sandbox/merlin/merlin-extensions/merlin-jndi/src/java/org/apache/avalon/merlin/jndi/ServiceFactory.java
  
  Index: ServiceFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi/src/java/org/apache/avalon/merlin/jndi/ServiceFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServiceFactory.java	16 Apr 2003 14:56:19 -0000	1.3
  +++ ServiceFactory.java	12 Jun 2003 18:56:20 -0000	1.4
  @@ -50,18 +50,21 @@
   
   package org.apache.avalon.merlin.jndi;
   
  -import javax.naming.*;
  -import javax.naming.spi.ObjectFactory;
  -import java.util.Hashtable;
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Hashtable;
   import java.io.File;
  -import java.net.URL;
  -import java.net.URLClassLoader;
   import java.lang.reflect.Constructor;
   import java.lang.reflect.Method;
  +import java.net.URL;
  +import java.net.URLClassLoader;
  +import java.util.ArrayList;
  +import java.util.Hashtable;
  +import java.util.List;
  +import java.util.Map;
  +
  +import javax.naming.Context;
  +import javax.naming.Name;
  +import javax.naming.RefAddr;
  +import javax.naming.Reference;
  +import javax.naming.spi.ObjectFactory;
   
   /**
    * This is an object factory that when given a reference for a service
  
  
  
  1.10      +3 -11     avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultAppliance.java	7 Jun 2003 21:12:47 -0000	1.9
  +++ DefaultAppliance.java	12 Jun 2003 18:56:20 -0000	1.10
  @@ -56,17 +56,10 @@
   import java.util.Hashtable;
   import java.util.Map;
   
  -import org.apache.avalon.assembly.appliance.Appliance;
  -import org.apache.avalon.assembly.appliance.ApplianceContext;
  -import org.apache.avalon.assembly.appliance.ApplianceRepository;
  -import org.apache.avalon.assembly.appliance.DependencyGraph;
  -import org.apache.avalon.assembly.appliance.UnknownServiceException;
  -import org.apache.avalon.assembly.appliance.ApplianceException;
  -import org.apache.avalon.assembly.appliance.ApplianceRuntimeException;
  -import org.apache.avalon.assembly.engine.Engine;
  +import org.apache.avalon.assembly.appliance.*;
   import org.apache.avalon.assembly.engine.RepositoryManager;
  -import org.apache.avalon.assembly.engine.service.ServiceRepository;
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
  +import org.apache.avalon.assembly.engine.service.ServiceRepository;
   import org.apache.avalon.assembly.lifestyle.LifestyleHandler;
   import org.apache.avalon.assembly.lifestyle.LifestyleService;
   import org.apache.avalon.assembly.locator.Contextualizable;
  @@ -85,7 +78,6 @@
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.model.Profile;
   import org.apache.avalon.meta.model.ContextDirective;
   import org.apache.avalon.meta.model.LoggingDirective;
   
  
  
  
  1.3       +1 -2      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineConfigurationHelper.java
  
  Index: EngineConfigurationHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineConfigurationHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EngineConfigurationHelper.java	26 May 2003 17:51:52 -0000	1.2
  +++ EngineConfigurationHelper.java	12 Jun 2003 18:56:20 -0000	1.3
  @@ -64,7 +64,6 @@
   import org.apache.avalon.assembly.engine.model.ResourceDescriptor;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.meta.model.Profile;
   
   /**
    * Handles internalization of an XML based description of a {@link Profile}
  
  
  
  1.2       +1 -2      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/repository/TransportException.java
  
  Index: TransportException.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/repository/TransportException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransportException.java	30 Apr 2003 11:11:57 -0000	1.1
  +++ TransportException.java	12 Jun 2003 18:56:20 -0000	1.2
  @@ -50,7 +50,6 @@
   
   package org.apache.avalon.assembly.repository;
   
  -import org.apache.avalon.framework.CascadingException;
   
   /**
    * Exception to indicate that there was a repository transport related error.
  
  
  
  1.6       +1 -2      avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java
  
  Index: Profile.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Profile.java	28 Apr 2003 21:19:44 -0000	1.5
  +++ Profile.java	12 Jun 2003 18:56:20 -0000	1.6
  @@ -51,7 +51,6 @@
   package org.apache.avalon.meta.model;
   
   import java.io.Serializable;
  -import java.util.ArrayList;
   
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
  
  
  
  1.6       +2 -6      avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
  
  Index: MerlinBean.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MerlinBean.java	9 Jun 2003 01:10:17 -0000	1.5
  +++ MerlinBean.java	12 Jun 2003 18:56:20 -0000	1.6
  @@ -51,22 +51,18 @@
   
   import java.io.File;
   import java.net.URL;
  -import java.net.URLClassLoader;
   import java.util.ArrayList;
   import java.util.Hashtable;
   import java.util.List;
   import java.util.Map;
   
   import org.apache.avalon.assembly.util.ExceptionHelper;
  -import org.apache.avalon.assembly.locator.Contextualizable;
  -import org.apache.avalon.assembly.util.ExceptionHelper;
  +import org.apache.avalon.merlin.block.impl.StandardBlock;
   import org.apache.avalon.merlin.kernel.Kernel;
   import org.apache.avalon.merlin.kernel.KernelException;
  -import org.apache.avalon.merlin.kernel.KernelRuntimeException;
   import org.apache.avalon.merlin.kernel.KernelLoader;
  +import org.apache.avalon.merlin.kernel.KernelRuntimeException;
   import org.apache.avalon.merlin.kernel.impl.DefaultKernelLoader;
  -import org.apache.avalon.merlin.block.Block;
  -import org.apache.avalon.merlin.block.impl.StandardBlock;
   
   
   /**
  
  
  
  1.7       +1 -2      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultContainer.java	29 Apr 2003 21:07:36 -0000	1.6
  +++ DefaultContainer.java	12 Jun 2003 18:56:20 -0000	1.7
  @@ -62,7 +62,6 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.merlin.container.Container;
  -import org.apache.avalon.merlin.container.ContainerException;
   
   /**
    * <p>Default implementation of a container.</p>
  
  
  
  1.5       +0 -1      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/Resolvable.java
  
  Index: Resolvable.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/Resolvable.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Resolvable.java	24 Apr 2003 12:29:57 -0000	1.4
  +++ Resolvable.java	12 Jun 2003 18:56:21 -0000	1.5
  @@ -54,7 +54,6 @@
    */
   package org.apache.avalon.assembly.locator;
   
  -import org.apache.avalon.framework.context.ContextException;
   
   /**
    * This interface is used to indicate objects that need to be
  
  
  
  1.8       +1 -2      avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Kernel.java	9 May 2003 06:39:39 -0000	1.7
  +++ Kernel.java	12 Jun 2003 18:56:21 -0000	1.8
  @@ -51,7 +51,6 @@
   package org.apache.avalon.merlin.kernel;
   
   import java.net.URL;
  -import org.apache.avalon.merlin.block.Block;
   
   /**
    * A service that provides support for the establishment and management of a set
  
  
  

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


Mime
View raw message