mcconnell 2003/10/17 17:34:20
Modified: merlin/activation/api/src/java/org/apache/avalon/activation/appliance
Appliance.java
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
AbstractAppliance.java DefaultAppliance.java
DefaultApplianceMBean.java
DefaultApplianceRepository.java DefaultBlock.java
DefaultServiceManager.java
merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl
SingletonLifestyleHandler.java
TransientLifestyleHandler.java
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java RuntimeTestCase.java
merlin/activation/impl/src/test/org/apache/avalon/playground/basic
BasicContextImp.java
merlin/activation/spi/src/java/org/apache/avalon/activation/appliance
ApplianceFactory.java ApplianceRepository.java
DependencyGraph.java
merlin project.xml
Log:
Housekeeping.
Revision Changes Path
1.2 +1 -14
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java
Index: Appliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Appliance.java 12 Oct 2003 15:34:49 -0000 1.1
+++ Appliance.java 18 Oct 2003 00:34:19 -0000 1.2
@@ -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
1.2 +1 -16
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java
Index: AbstractAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAppliance.java 24 Sep 2003 09:30:31 -0000 1.1
+++ AbstractAppliance.java 18 Oct 2003 00:34:19 -0000 1.2
@@ -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
1.4 +13 -22
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultAppliance.java 17 Oct 2003 06:44:49 -0000 1.3
+++ DefaultAppliance.java 18 Oct 2003 00:34:19 -0000 1.4
@@ -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.Hashtable;
+import java.util.ArrayList;
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.ApplianceException;
@@ -65,30 +63,29 @@
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;
@@ -100,16 +97,10 @@
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.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
1.3 +1 -15
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java
Index: DefaultApplianceMBean.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultApplianceMBean.java 24 Sep 2003 10:35:34 -0000 1.2
+++ DefaultApplianceMBean.java 18 Oct 2003 00:34:19 -0000 1.3
@@ -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
1.2 +1 -4
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java
Index: DefaultApplianceRepository.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultApplianceRepository.java 24 Sep 2003 09:30:37 -0000 1.1
+++ DefaultApplianceRepository.java 18 Oct 2003 00:34:19 -0000 1.2
@@ -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
1.4 +21 -27
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlock.java 17 Oct 2003 03:26:28 -0000 1.3
+++ DefaultBlock.java 18 Oct 2003 00:34:19 -0000 1.4
@@ -50,49 +50,39 @@
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.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.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 +192,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 +612,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
@@ -895,7 +888,8 @@
private Class[] getInterfaceClasses() throws Exception
{
- ClassLoader loader = m_model.getClassLoaderModel().getClassLoader();
+ ClassLoader loader =
+ m_model.getClassLoaderModel().getClassLoader();
ArrayList list = new ArrayList();
ServiceDirective[] services = m_model.getExportDirectives();
for( int i=0; i<services.length; i++ )
1.3 +0 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServiceManager.java 17 Oct 2003 03:26:28 -0000 1.2
+++ DefaultServiceManager.java 18 Oct 2003 00:34:19 -0000 1.3
@@ -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;
1.4 +1 -3
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java
Index: SingletonLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SingletonLifestyleHandler.java 17 Oct 2003 06:44:49 -0000 1.3
+++ SingletonLifestyleHandler.java 18 Oct 2003 00:34:19 -0000 1.4
@@ -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;
1.4 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java
Index: TransientLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransientLifestyleHandler.java 17 Oct 2003 06:44:49 -0000 1.3
+++ TransientLifestyleHandler.java 18 Oct 2003 00:34:19 -0000 1.4
@@ -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;
1.3 +3 -16
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTestCase.java 17 Oct 2003 03:26:28 -0000 1.2
+++ AbstractTestCase.java 18 Oct 2003 00:34:19 -0000 1.3
@@ -3,39 +3,26 @@
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
{
1.2 +1 -23
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java
Index: RuntimeTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RuntimeTestCase.java 24 Sep 2003 09:30:51 -0000 1.1
+++ RuntimeTestCase.java 18 Oct 2003 00:34:19 -0000 1.2
@@ -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
{
1.2 +0 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicContextImp.java
Index: BasicContextImp.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicContextImp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicContextImp.java 24 Sep 2003 09:30:56 -0000 1.1
+++ BasicContextImp.java 18 Oct 2003 00:34:20 -0000 1.2
@@ -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;
1.2 +1 -2
avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java
Index: ApplianceFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplianceFactory.java 24 Sep 2003 09:30:57 -0000 1.1
+++ ApplianceFactory.java 18 Oct 2003 00:34:20 -0000 1.2
@@ -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
1.2 +1 -4
avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java
Index: ApplianceRepository.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplianceRepository.java 24 Sep 2003 09:30:57 -0000 1.1
+++ ApplianceRepository.java 18 Oct 2003 00:34:20 -0000 1.2
@@ -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;
1.2 +1 -6
avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyGraph.java 24 Sep 2003 09:30:59 -0000 1.1
+++ DependencyGraph.java 18 Oct 2003 00:34:20 -0000 1.2
@@ -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>
1.5 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 7 Oct 2003 18:04:34 -0000 1.4
+++ project.xml 18 Oct 2003 00:34:20 -0000 1.5
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Merlin POM</name>
- <currentVersion>3.1</currentVersion>
+ <currentVersion>3.2</currentVersion>
<organization>
<name>Apache Software Foundation</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
