akarasulu 2003/11/03 17:07:52
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultBlock.java CompositeBlock.java
DefaultBlockContext.java AbstractBlock.java
Log:
Unused import cleanup.
Revision Changes Path
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultBlock.java 22 Oct 2003 01:45:37 -0000 1.5
+++ DefaultBlock.java 4 Nov 2003 01:07:52 -0000 1.6
@@ -661,7 +661,7 @@
{
try
{
- Thread.currentThread().sleep( 300 );
+ Thread.sleep( 300 );
}
catch( Throwable e )
{
1.2 +1 -20
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java
Index: CompositeBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompositeBlock.java 3 Nov 2003 06:14:08 -0000 1.1
+++ CompositeBlock.java 4 Nov 2003 01:07:52 -0000 1.2
@@ -57,33 +57,14 @@
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.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.Block;
import org.apache.avalon.activation.appliance.BlockContext;
-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.Home;
-import org.apache.avalon.activation.appliance.NoProviderDefinitionException;
-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.ContainmentModel;
-import org.apache.avalon.composition.model.DependencyModel;
-import org.apache.avalon.composition.model.DeploymentModel;
-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.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
/**
* The DefaultBlock is responsible for the management
1.3 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultBlockContext.java 3 Nov 2003 06:11:30 -0000 1.2
+++ DefaultBlockContext.java 4 Nov 2003 01:07:52 -0000 1.3
@@ -52,7 +52,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.activation.appliance.ApplianceRepository;
import org.apache.avalon.activation.appliance.DependencyGraph;
import org.apache.avalon.activation.appliance.ServiceContext;
1.3 +2 -10
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractBlock.java 3 Nov 2003 18:54:18 -0000 1.2
+++ AbstractBlock.java 4 Nov 2003 01:07:52 -0000 1.3
@@ -50,15 +50,8 @@
package org.apache.avalon.activation.appliance.impl;
-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.Appliance;
import org.apache.avalon.activation.appliance.ApplianceException;
@@ -73,7 +66,6 @@
import org.apache.avalon.activation.appliance.NoProviderDefinitionException;
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.logging.LoggingManager;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DependencyModel;
@@ -624,7 +616,7 @@
{
try
{
- Thread.currentThread().sleep( 300 );
+ Thread.sleep( 300 );
}
catch( Throwable e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
