[EMAIL PROTECTED] wrote:
Steve,
I was just going through the merlin code base. It looks really good but I removed some unnecessary imports that were not being used. Would you be interested in these patches that just remove unneeded imports? I'm a import and code nazi. Bad eyes make it a necessity. No I did not group and alphebetise them but I thought about it ;-). I can give you diffs as I go along trying to understand the code base. I want to get really familiar with it since it will be at the heart of the LDAP server.
Patches are appreciated - keep then rolling!
When the time is right I would also like to contribute back but I'm far far from that point now. Just understanding and using the API's is my first goal.
Based on all the stuff I'm tracking on the ldapd project - you already have a good understanding of the uesage aspect of merlin. The fun will start with embedding because you will be working with api that are evolving. As you get deeper into Merlin usage we should get you setup as a committer here in Avalon.
Attached are those insignificant import deletion patches in the unified diff format.
Applied.
Cheers, Steve.
Alex
------------------------------------------------------------------------
Index: src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 ApplianceFactory.java --- src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java 24 Sep 2003 09:30:57 -0000 1.1.1.1 +++ src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java 17 Oct 2003 19:54:56 -0000 @@ -51,7 +51,6 @@ package org.apache.avalon.activation.appliance;
import org.apache.avalon.composition.model.Model; -import org.apache.avalon.framework.logger.Logger;
/** * An appliance factory is a service that provides support for the creation Index: src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 ApplianceRepository.java --- src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java 24 Sep 2003 09:30:57 -0000 1.1.1.1 +++ src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java 17 Oct 2003 19:54:57 -0000 @@ -50,9 +50,6 @@
package org.apache.avalon.activation.appliance;
-import java.net.URL; -import java.util.Map; - import org.apache.avalon.meta.info.DependencyDescriptor; import org.apache.avalon.meta.info.StageDescriptor;
Index: src/java/org/apache/avalon/activation/appliance/DependencyGraph.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 DependencyGraph.java --- src/java/org/apache/avalon/activation/appliance/DependencyGraph.java 24 Sep 2003 09:30:59 -0000 1.1.1.1 +++ src/java/org/apache/avalon/activation/appliance/DependencyGraph.java 17 Oct 2003 19:54:57 -0000 @@ -57,11 +57,6 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model; -import org.apache.avalon.composition.model.DeploymentModel; -import org.apache.avalon.meta.info.DependencyDescriptor; -import org.apache.avalon.meta.info.StageDescriptor; - /** * <p>Utility class to help aquire a ordered graph of * consumers and providers for specific components.</p>
------------------------------------------------------------------------
Index: src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 AbstractAppliance.java --- src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java 24 Sep 2003 09:30:31 -0000 1.1.1.1 +++ src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java 17 Oct 2003 19:54:32 -0000 @@ -50,26 +50,11 @@
package org.apache.avalon.activation.appliance.impl;
-import java.net.URL; -import java.util.Map; -import java.util.Hashtable; - import org.apache.avalon.activation.appliance.Appliance; -import org.apache.avalon.activation.appliance.ApplianceException; -import org.apache.avalon.activation.appliance.ApplianceRepository; -import org.apache.avalon.composition.data.ContextDirective; -import org.apache.avalon.composition.data.CategoriesDirective; import org.apache.avalon.composition.model.Model; import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.logger.Logger; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.meta.info.DependencyDescriptor; -import org.apache.avalon.meta.info.ServiceDescriptor; -import org.apache.avalon.meta.info.ReferenceDescriptor; -import org.apache.avalon.meta.info.StageDescriptor; -import org.apache.avalon.meta.info.Type;
/** * An Appliance is the basic tool merlin wraps around a component to Index: src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v retrieving revision 1.3 diff -u -r1.3 DefaultAppliance.java --- src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java 17 Oct 2003 06:44:49 -0000 1.3 +++ src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java 17 Oct 2003 19:54:32 -0000 @@ -50,14 +50,12 @@
package org.apache.avalon.activation.appliance.impl;
-import java.net.URL; -import java.util.Map; -import java.util.Hashtable; -import java.util.ArrayList; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Hashtable;
import org.apache.avalon.activation.appliance.Appliance; import org.apache.avalon.activation.appliance.ApplianceException; @@ -65,51 +63,40 @@ import org.apache.avalon.activation.appliance.Composite; import org.apache.avalon.activation.appliance.Engine; import org.apache.avalon.activation.appliance.ServiceContext; -import org.apache.avalon.activation.lifestyle.LifestyleHandler; -import org.apache.avalon.activation.lifestyle.impl.SingletonLifestyleHandler; -import org.apache.avalon.activation.lifestyle.impl.ThreadLifestyleHandler; -import org.apache.avalon.activation.lifestyle.impl.PooledLifestyleHandler; -import org.apache.avalon.activation.lifestyle.impl.TransientLifestyleHandler; import org.apache.avalon.activation.lifecycle.ContextualizationHandler; import org.apache.avalon.activation.lifecycle.Factory; -import org.apache.avalon.activation.lifecycle.LifecycleException; import org.apache.avalon.activation.lifecycle.LifecycleCreateExtension; import org.apache.avalon.activation.lifecycle.LifecycleDestroyExtension; -import org.apache.avalon.composition.data.ContextDirective; +import org.apache.avalon.activation.lifecycle.LifecycleException; +import org.apache.avalon.activation.lifestyle.LifestyleHandler; +import org.apache.avalon.activation.lifestyle.impl.PooledLifestyleHandler; +import org.apache.avalon.activation.lifestyle.impl.SingletonLifestyleHandler; +import org.apache.avalon.activation.lifestyle.impl.ThreadLifestyleHandler; +import org.apache.avalon.activation.lifestyle.impl.TransientLifestyleHandler; import org.apache.avalon.composition.data.CategoriesDirective; +import org.apache.avalon.composition.logging.LoggingManager; import org.apache.avalon.composition.model.ContextModel; -import org.apache.avalon.composition.model.DeploymentModel; import org.apache.avalon.composition.model.DependencyModel; -import org.apache.avalon.composition.model.Model; +import org.apache.avalon.composition.model.DeploymentModel; import org.apache.avalon.composition.model.StageModel; -import org.apache.avalon.composition.logging.LoggingManager; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +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.activity.Disposable; +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.logger.Logger; +import org.apache.avalon.framework.parameters.Parameterizable; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.lifecycle.Accessor; import org.apache.avalon.lifecycle.Creator; import org.apache.avalon.meta.info.InfoDescriptor; -import org.apache.avalon.meta.info.DependencyDescriptor; -import org.apache.avalon.meta.info.ServiceDescriptor; -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.info.ExtensionDescriptor;
/**
* DefaultAppliance is the default implementation of a local Index: src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java
===================================================================
RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java,v
retrieving revision 1.2
diff -u -r1.2 DefaultApplianceMBean.java
--- src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java 24 Sep 2003 10:35:34 -0000 1.2
+++ src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java 17 Oct 2003 19:54:32 -0000
@@ -50,21 +50,7 @@
package org.apache.avalon.activation.appliance.impl;
-import java.net.URL; -import java.util.Map; - import org.apache.avalon.activation.appliance.Deployable; -import org.apache.avalon.composition.model.Model; -import org.apache.avalon.composition.model.DeploymentModel; -import org.apache.avalon.composition.data.ContextDirective; -import org.apache.avalon.composition.data.CategoriesDirective; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.meta.info.DependencyDescriptor; -import org.apache.avalon.meta.info.ServiceDescriptor; -import org.apache.avalon.meta.info.ReferenceDescriptor; -import org.apache.avalon.meta.info.StageDescriptor; -import org.apache.avalon.meta.info.Type;
/** * An Appliance is the basic tool merlin wraps around a component to Index: src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 DefaultApplianceRepository.java --- src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java 24 Sep 2003 09:30:37 -0000 1.1.1.1 +++ src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java 17 Oct 2003 19:54:32 -0000 @@ -56,11 +56,8 @@
import org.apache.avalon.activation.appliance.Appliance; import org.apache.avalon.activation.appliance.ApplianceRepository; -import org.apache.avalon.activation.appliance.ApplianceException; -import org.apache.avalon.composition.model.Model; import org.apache.avalon.meta.info.DependencyDescriptor; import org.apache.avalon.meta.info.StageDescriptor; -import org.apache.avalon.meta.info.ReferenceDescriptor;
/**
* The appliance repository interface declares operations through which Index: src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java
===================================================================
RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java,v
retrieving revision 1.3
diff -u -r1.3 DefaultBlock.java
--- src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java 17 Oct 2003 03:26:28 -0000 1.3
+++ src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java 17 Oct 2003 19:54:32 -0000
@@ -50,49 +50,38 @@
package org.apache.avalon.activation.appliance.impl;
-import java.net.URL; -import java.net.URLClassLoader; -import java.util.Map; -import java.util.Hashtable; -import java.util.ArrayList; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Map;
-import org.apache.avalon.activation.appliance.Block; import org.apache.avalon.activation.appliance.Appliance; import org.apache.avalon.activation.appliance.ApplianceException; import org.apache.avalon.activation.appliance.ApplianceRepository; import org.apache.avalon.activation.appliance.AssemblyException; -import org.apache.avalon.activation.appliance.DependencyGraph; +import org.apache.avalon.activation.appliance.Block; import org.apache.avalon.activation.appliance.Composite; +import org.apache.avalon.activation.appliance.DependencyGraph; +import org.apache.avalon.activation.appliance.DeploymentException; import org.apache.avalon.activation.appliance.Engine; -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.activation.appliance.ServiceContext; import org.apache.avalon.composition.data.CategoriesDirective; import org.apache.avalon.composition.data.ServiceDirective; -import org.apache.avalon.composition.model.Model; -import org.apache.avalon.composition.model.StageModel; -import org.apache.avalon.composition.model.DependencyModel; import org.apache.avalon.composition.model.ContainmentModel; +import org.apache.avalon.composition.model.DependencyModel; import org.apache.avalon.composition.model.DeploymentModel; -import org.apache.avalon.composition.util.ExceptionHelper; -import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.composition.model.Model; +import org.apache.avalon.composition.model.StageModel; 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; -import org.apache.avalon.meta.info.ServiceDescriptor; -import org.apache.avalon.meta.info.ReferenceDescriptor; import org.apache.avalon.meta.info.StageDescriptor; -import org.apache.avalon.meta.info.Type;
/**
* The DefaultBlock is responsible for the management @@ -202,7 +191,8 @@
try
{
Logger log = getLogger().getChildLogger( "proxy" );
- BlockInvocationHandler handler = new BlockInvocationHandler( log, this );
+ BlockInvocationHandler handler = + new BlockInvocationHandler( log, this );
Class[] classes = getInterfaceClasses();
m_proxy = Proxy.newProxyInstance( m_model.getClassLoaderModel().getClassLoader(),
@@ -621,8 +611,10 @@
if( thread.getError() != null )
{
final String error =
- "Composite deployment failure in block: [" + block + "]";
- throw new DeploymentException( error, thread.getError() ); + "Composite deployment failure in block: [" + + block + "]";
+ throw new DeploymentException( error, + thread.getError() ); }
}
else
Index: src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java
===================================================================
RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java,v
retrieving revision 1.2
diff -u -r1.2 DefaultServiceManager.java
--- src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java 17 Oct 2003 03:26:28 -0000 1.2
+++ src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java 17 Oct 2003 19:54:32 -0000
@@ -58,8 +58,6 @@
import java.util.Hashtable;
import org.apache.avalon.activation.appliance.Appliance; -import org.apache.avalon.activation.appliance.ApplianceException; -import org.apache.avalon.activation.appliance.ApplianceRuntimeException; import org.apache.avalon.activation.appliance.Home; import org.apache.avalon.composition.util.ExceptionHelper; import org.apache.avalon.framework.logger.Logger; Index: src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java,v retrieving revision 1.3 diff -u -r1.3 SingletonLifestyleHandler.java --- src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java 17 Oct 2003 06:44:49 -0000 1.3 +++ src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java 17 Oct 2003 19:54:32 -0000 @@ -51,8 +51,6 @@ package org.apache.avalon.activation.lifestyle.impl;
import java.lang.ref.Reference; -import java.lang.ref.SoftReference; -import java.lang.ref.WeakReference;
import org.apache.avalon.activation.lifecycle.Factory; import org.apache.avalon.framework.activity.Disposable; Index: src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java,v retrieving revision 1.3 diff -u -r1.3 TransientLifestyleHandler.java --- src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java 17 Oct 2003 06:44:49 -0000 1.3 +++ src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java 17 Oct 2003 19:54:32 -0000 @@ -51,7 +51,6 @@ package org.apache.avalon.activation.lifestyle.impl;
import java.lang.ref.Reference; -import java.lang.ref.WeakReference; import java.util.ArrayList;
import org.apache.avalon.activation.lifecycle.Factory; Index: src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java,v retrieving revision 1.2 diff -u -r1.2 AbstractTestCase.java --- src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java 17 Oct 2003 03:26:28 -0000 1.2 +++ src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java 17 Oct 2003 19:54:32 -0000 @@ -3,39 +3,25 @@ package org.apache.avalon.activation.appliance;
import java.io.File; -import java.io.IOException; -import java.net.URL;
-import org.apache.avalon.activation.appliance.ServiceContext; +import junit.framework.TestCase; + import org.apache.avalon.activation.appliance.impl.DefaultServiceContext; -import org.apache.avalon.composition.data.CategoryDirective; -import org.apache.avalon.composition.data.CategoriesDirective; import org.apache.avalon.composition.data.ContainmentProfile; -import org.apache.avalon.composition.data.ClassLoaderDirective; import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator; import org.apache.avalon.composition.logging.LoggingManager; -import org.apache.avalon.composition.logging.LoggerException; -import org.apache.avalon.composition.logging.LoggingDescriptor; -import org.apache.avalon.composition.logging.TargetDescriptor; -import org.apache.avalon.composition.logging.TargetProvider; -import org.apache.avalon.composition.logging.impl.DefaultLoggingManager; import org.apache.avalon.composition.model.ContainmentModel; import org.apache.avalon.composition.model.SystemContext; import org.apache.avalon.composition.model.impl.DefaultSystemContext; -import org.apache.avalon.composition.model.impl.DefaultModelFactory; -import org.apache.avalon.composition.util.ExceptionHelper; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; -import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.logger.ConsoleLogger; -import org.apache.avalon.framework.context.DefaultContext; +import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; import org.apache.excalibur.event.command.CommandManager; import org.apache.excalibur.event.command.TPCThreadManager; import org.apache.excalibur.mpool.DefaultPoolManager; import org.apache.excalibur.mpool.PoolManager; - -import junit.framework.TestCase;
public abstract class AbstractTestCase extends TestCase { Index: src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 RuntimeTestCase.java --- src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java 24 Sep 2003 09:30:51 -0000 1.1.1.1 +++ src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java 17 Oct 2003 19:54:32 -0000 @@ -2,31 +2,9 @@
package org.apache.avalon.activation.appliance;
-import java.io.File; -import java.io.IOException; -import java.net.URL; - -import org.apache.avalon.activation.appliance.*; -import org.apache.avalon.activation.appliance.impl.*; -import org.apache.avalon.composition.logging.LoggingManager; -import org.apache.avalon.composition.model.ContainmentModel; -import org.apache.avalon.composition.model.SystemContext; -import org.apache.avalon.composition.model.impl.DefaultModelFactory; -import org.apache.avalon.composition.model.impl.DefaultSystemContext; -import org.apache.avalon.composition.data.ServiceDirective; -import org.apache.avalon.composition.data.ContainmentProfile; -import org.apache.avalon.composition.data.ClassLoaderDirective; +import org.apache.avalon.activation.appliance.impl.DefaultBlock; import org.apache.avalon.composition.util.ExceptionHelper; -import org.apache.avalon.framework.logger.Logger; -import org.apache.avalon.framework.logger.ConsoleLogger; -import org.apache.avalon.framework.context.Context; -import org.apache.avalon.framework.context.DefaultContext; import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.meta.info.DependencyDescriptor; -import org.apache.avalon.meta.info.ServiceDescriptor; -import org.apache.excalibur.mpool.PoolManager; - -import junit.framework.TestCase;
public class RuntimeTestCase extends AbstractTestCase { Index: src/test/org/apache/avalon/playground/basic/BasicContextImp.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicContextImp.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 BasicContextImp.java --- src/test/org/apache/avalon/playground/basic/BasicContextImp.java 24 Sep 2003 09:30:56 -0000 1.1.1.1 +++ src/test/org/apache/avalon/playground/basic/BasicContextImp.java 17 Oct 2003 19:54:34 -0000 @@ -56,7 +56,6 @@ package org.apache.avalon.playground.basic;
import java.io.File; -import java.util.Map;
import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.DefaultContext;
------------------------------------------------------------------------
Index: src/java/org/apache/avalon/activation/appliance/Appliance.java =================================================================== RCS file: /home/cvspublic/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java,v retrieving revision 1.1 diff -u -r1.1 Appliance.java --- src/java/org/apache/avalon/activation/appliance/Appliance.java 12 Oct 2003 15:34:49 -0000 1.1 +++ src/java/org/apache/avalon/activation/appliance/Appliance.java 17 Oct 2003 19:54:04 -0000 @@ -50,20 +50,7 @@
package org.apache.avalon.activation.appliance;
-import java.net.URL; -import java.util.Map; - import org.apache.avalon.composition.model.Model; -import org.apache.avalon.composition.model.DeploymentModel; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.meta.info.DependencyDescriptor; -import org.apache.avalon.meta.info.ServiceDescriptor; -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.composition.data.ContextDirective; -import org.apache.avalon.composition.data.CategoriesDirective;
/** * An Appliance is the basic tool merlin wraps around a component to
------------------------------------------------------------------------
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
--
Stephen J. McConnell mailto:[EMAIL PROTECTED]
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
