You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by cz...@apache.org on 2004/03/17 11:39:12 UTC
cvs commit: avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm DefaultRoleManager.java RoleManager.java
cziegeler 2004/03/17 02:39:12
Modified: merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
AbstractTestCase.java IncludesTestCase.java
AssemblyTestCase.java DynamicsTestCase.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultContainmentModel.java
DefaultSystemContextFactory.java
DefaultContext.java DefaultDependencyModel.java
DefaultSecurityModel.java
DefaultComponentContext.java
DefaultContainmentModelAssemblyHelper.java
DefaultSystemContext.java DefaultImportModel.java
CommissionRequest.java DefaultDependent.java
DefaultDeploymentModel.java
DefaultClassLoaderContext.java Commissioner.java
DefaultModelFactory.java
DefaultConstructorModel.java
DefaultComponentModel.java DefaultStageModel.java
DefaultContextModel.java Scanner.java
DefaultContainmentModelComponentHelper.java
DefaultContainmentContext.java
merlin/composition/spi/src/java/org/apache/avalon/composition/provider
ContainmentContext.java SystemContext.java
SecurityModel.java SystemContextFactory.java
ModelFactory.java ComponentContext.java
merlin/composition/impl/src/test/org/apache/avalon/playground
ComplexComponent.java
merlin/facilities/finder/impl/src/test/org/apache/avalon/finder/impl/test
DefaultFinderTestCase.java
merlin/kernel/api/src/java/org/apache/avalon/merlin
KernelContext.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
XMLComponentProfileCreator.java
XMLTargetsCreator.java
XMLSecurityProfileBuilder.java
XMLProfileCreator.java
XMLContainmentProfileCreator.java
merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl
ContainmentModelHandler.java DefaultServer.java
ComponentModelHolder.java DefaultModelListener.java
merlin/kernel/api/src/java/org/apache/avalon/merlin/event
KernelStateEvent.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl
CommissionerTestCase.java
merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm
DefaultRoleManager.java RoleManager.java
Log:
Remove unused imports
Revision Changes Path
1.8 +0 -2 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractTestCase.java 4 Mar 2004 03:42:30 -0000 1.7
+++ AbstractTestCase.java 17 Mar 2004 10:39:09 -0000 1.8
@@ -47,8 +47,6 @@
import org.apache.avalon.util.exception.ExceptionHelper;
import org.apache.avalon.util.env.Env;
-import org.apache.excalibur.configuration.ConfigurationUtil;
-
import junit.framework.TestCase;
public abstract class AbstractTestCase extends TestCase
1.9 +0 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java
Index: IncludesTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IncludesTestCase.java 27 Feb 2004 22:39:36 -0000 1.8
+++ IncludesTestCase.java 17 Mar 2004 10:39:09 -0000 1.9
@@ -18,7 +18,6 @@
package org.apache.avalon.composition.model.test;
-import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.util.exception.ExceptionHelper;
1.7 +0 -5 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java
Index: AssemblyTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AssemblyTestCase.java 27 Feb 2004 22:39:36 -0000 1.6
+++ AssemblyTestCase.java 17 Mar 2004 10:39:09 -0000 1.7
@@ -17,11 +17,6 @@
package org.apache.avalon.composition.model.test;
-import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.DependencyModel;
-
import org.apache.avalon.util.exception.ExceptionHelper;
public class AssemblyTestCase extends AbstractTestCase
1.3 +0 -3 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DynamicsTestCase.java
Index: DynamicsTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DynamicsTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicsTestCase.java 27 Feb 2004 22:39:36 -0000 1.2
+++ DynamicsTestCase.java 17 Mar 2004 10:39:09 -0000 1.3
@@ -18,9 +18,6 @@
package org.apache.avalon.composition.model.test;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.meta.info.ReferenceDescriptor;
1.43 +1 -14 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- DefaultContainmentModel.java 13 Mar 2004 23:26:57 -0000 1.42
+++ DefaultContainmentModel.java 17 Mar 2004 10:39:10 -0000 1.43
@@ -25,10 +25,8 @@
import java.net.URLConnection;
import java.util.LinkedList;
import java.util.Iterator;
-import java.util.Hashtable;
import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
import org.apache.avalon.logging.data.CategoriesDirective;
@@ -39,7 +37,6 @@
import org.apache.avalon.composition.data.NamedComponentProfile;
import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.ResourceDirective;
-import org.apache.avalon.composition.data.ServiceDirective;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.builder.XMLTargetsCreator;
import org.apache.avalon.composition.data.builder.ContainmentProfileBuilder;
@@ -49,24 +46,16 @@
import org.apache.avalon.composition.model.AssemblyException;
import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.DependencyGraph;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelException;
-import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.ModelRepository;
-import org.apache.avalon.composition.model.ModelSelector;
-import org.apache.avalon.composition.model.ProfileSelector;
import org.apache.avalon.composition.model.ServiceModel;
-import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.TypeRepository;
-import org.apache.avalon.composition.model.TypeUnknownException;
import org.apache.avalon.composition.provider.ModelFactory;
import org.apache.avalon.composition.provider.SecurityModel;
-import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.ComponentContext;
-import org.apache.avalon.composition.provider.ClassLoaderContext;
import org.apache.avalon.composition.provider.ContainmentContext;
import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.composition.util.DefaultState;
@@ -80,7 +69,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
@@ -88,7 +76,6 @@
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
-import org.apache.avalon.util.exception.ExceptionHelper;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.8 +1 -18 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContextFactory.java
Index: DefaultSystemContextFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContextFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultSystemContextFactory.java 8 Mar 2004 11:28:36 -0000 1.7
+++ DefaultSystemContextFactory.java 17 Mar 2004 10:39:10 -0000 1.8
@@ -18,43 +18,26 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.net.URL;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException ;
-import java.lang.reflect.Method ;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.avalon.logging.provider.LoggingException;
import org.apache.avalon.logging.provider.LoggingFactory;
import org.apache.avalon.logging.provider.LoggingCriteria;
import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.composition.data.SecurityProfile;
-import org.apache.avalon.composition.data.TargetDirective;
-import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ModelRuntimeException;
-import org.apache.avalon.composition.model.impl.DefaultModelFactory;
-import org.apache.avalon.composition.provider.ModelFactory;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.SystemContextFactory;
import org.apache.avalon.composition.provider.SystemException;
import org.apache.avalon.composition.provider.SecurityModel;
-import org.apache.avalon.composition.provider.Runtime;
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.provider.Factory;
-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.parameters.Parameters;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.9 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java
Index: DefaultContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultContext.java 8 Mar 2004 11:28:36 -0000 1.8
+++ DefaultContext.java 17 Mar 2004 10:39:10 -0000 1.9
@@ -19,7 +19,6 @@
import java.util.Map;
-import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.EntryModel;
import org.apache.avalon.framework.context.Context;
1.9 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java
Index: DefaultDependencyModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultDependencyModel.java 8 Mar 2004 11:28:36 -0000 1.8
+++ DefaultDependencyModel.java 17 Mar 2004 10:39:10 -0000 1.9
@@ -24,7 +24,6 @@
import org.apache.avalon.composition.data.DependencyDirective;
import org.apache.avalon.composition.data.SelectionDirective;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.DependencyDescriptor;
1.8 +1 -10 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSecurityModel.java
Index: DefaultSecurityModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSecurityModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultSecurityModel.java 7 Mar 2004 22:10:39 -0000 1.7
+++ DefaultSecurityModel.java 17 Mar 2004 10:39:10 -0000 1.8
@@ -20,20 +20,11 @@
import java.security.Permission;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.security.Permission;
import java.security.Permissions;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.net.URL;
import org.apache.avalon.composition.data.SecurityProfile;
import org.apache.avalon.composition.provider.SecurityModel;
import org.apache.avalon.composition.provider.SystemRuntimeException;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import org.apache.avalon.logging.data.CategoriesDirective;
import org.apache.avalon.meta.info.PermissionDescriptor;
1.11 +1 -13 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java
Index: DefaultComponentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultComponentContext.java 11 Mar 2004 01:30:38 -0000 1.10
+++ DefaultComponentContext.java 17 Mar 2004 10:39:10 -0000 1.11
@@ -18,28 +18,16 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.util.Map;
-import java.util.Hashtable;
import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.EntryModel;
-import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.DependencyGraph;
import org.apache.avalon.composition.provider.SystemContext;
-import org.apache.avalon.composition.provider.ContainmentContext;
import org.apache.avalon.composition.provider.ComponentContext;
-import org.apache.avalon.composition.provider.SecurityModel;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.Type;
-import org.apache.avalon.meta.info.EntryDescriptor;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.8 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
Index: DefaultContainmentModelAssemblyHelper.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultContainmentModelAssemblyHelper.java 13 Mar 2004 23:26:57 -0000 1.7
+++ DefaultContainmentModelAssemblyHelper.java 17 Mar 2004 10:39:10 -0000 1.8
@@ -42,7 +42,6 @@
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.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
1.29 +1 -11 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultSystemContext.java 8 Mar 2004 11:28:36 -0000 1.28
+++ DefaultSystemContext.java 17 Mar 2004 10:39:10 -0000 1.29
@@ -18,37 +18,27 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.net.URL;
import java.util.Map;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException ;
-import java.lang.reflect.Method ;
import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.composition.data.SecurityProfile;
-import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.impl.DefaultModelFactory;
import org.apache.avalon.composition.provider.ModelFactory;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.SystemException;
-import org.apache.avalon.composition.provider.SecurityModel;
import org.apache.avalon.composition.provider.Runtime;
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.provider.Factory;
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.parameters.Parameters;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.8 +1 -4 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java
Index: DefaultImportModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultImportModel.java 8 Mar 2004 11:28:36 -0000 1.7
+++ DefaultImportModel.java 17 Mar 2004 10:39:10 -0000 1.8
@@ -17,8 +17,6 @@
package org.apache.avalon.composition.model.impl;
-import java.util.Map;
-
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.provider.ComponentContext;
@@ -27,7 +25,6 @@
import org.apache.avalon.util.i18n.Resources;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.composition.data.ImportDirective;
import org.apache.avalon.meta.info.EntryDescriptor;
1.2 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java
Index: CommissionRequest.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommissionRequest.java 10 Feb 2004 16:23:33 -0000 1.1
+++ CommissionRequest.java 17 Mar 2004 10:39:10 -0000 1.2
@@ -19,7 +19,6 @@
import java.lang.reflect.InvocationTargetException;
-import org.apache.avalon.composition.model.Commissionable;
import org.apache.avalon.composition.model.CommissioningException;
import org.apache.avalon.composition.model.FatalCommissioningException;
import org.apache.avalon.composition.model.DeploymentModel;
1.5 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java
Index: DefaultDependent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultDependent.java 10 Feb 2004 16:23:33 -0000 1.4
+++ DefaultDependent.java 17 Mar 2004 10:39:10 -0000 1.5
@@ -17,8 +17,6 @@
package org.apache.avalon.composition.model.impl;
-import java.util.ArrayList;
-
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.Dependent;
1.21 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
Index: DefaultDeploymentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultDeploymentModel.java 11 Mar 2004 01:30:38 -0000 1.20
+++ DefaultDeploymentModel.java 17 Mar 2004 10:39:10 -0000 1.21
@@ -23,14 +23,12 @@
import org.apache.avalon.composition.data.Mode;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.DependencyGraph;
import org.apache.avalon.composition.model.Commissionable;
import org.apache.avalon.composition.provider.DeploymentContext;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.SecurityModel;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.7 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java
Index: DefaultClassLoaderContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultClassLoaderContext.java 8 Mar 2004 11:28:36 -0000 1.6
+++ DefaultClassLoaderContext.java 17 Mar 2004 10:39:10 -0000 1.7
@@ -19,7 +19,6 @@
import java.io.File;
import java.net.URL;
-import java.security.Permission;
import org.apache.avalon.composition.data.ClassLoaderDirective;
import org.apache.avalon.composition.model.TypeRepository;
1.3 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java
Index: Commissioner.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Commissioner.java 15 Mar 2004 12:59:10 -0000 1.2
+++ Commissioner.java 17 Mar 2004 10:39:10 -0000 1.3
@@ -19,10 +19,8 @@
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.Commissionable;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.activity.Disposable;
/**
* Runnable deployment thread that handles the commissioning of an
1.14 +1 -16 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java
Index: DefaultModelFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultModelFactory.java 8 Mar 2004 11:28:36 -0000 1.13
+++ DefaultModelFactory.java 17 Mar 2004 10:39:10 -0000 1.14
@@ -21,30 +21,21 @@
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
-import java.security.Policy;
-import java.security.CodeSource;
-import java.security.Permissions;
-import java.security.PermissionCollection;
-import java.security.ProtectionDomain;
import java.util.Hashtable;
import java.util.Map;
import java.util.Iterator;
import java.util.Set;
import org.apache.avalon.composition.data.SecurityProfile;
-import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.data.ClassLoaderDirective;
-import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.builder.ContainmentProfileBuilder;
import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ModelRuntimeException;
-import org.apache.avalon.composition.model.DependencyGraph;
import org.apache.avalon.composition.provider.SecurityModel;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.ModelFactory;
@@ -52,17 +43,11 @@
import org.apache.avalon.composition.provider.ComponentContext;
import org.apache.avalon.composition.provider.ClassLoaderContext;
-import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.data.CategoriesDirective;
-
import org.apache.avalon.repository.Repository;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-
-import org.apache.avalon.meta.info.Type;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.8 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java
Index: DefaultConstructorModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultConstructorModel.java 8 Mar 2004 11:28:36 -0000 1.7
+++ DefaultConstructorModel.java 17 Mar 2004 10:39:10 -0000 1.8
@@ -26,8 +26,6 @@
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.provider.ComponentContext;
-import org.apache.avalon.framework.context.ContextException;
-
import org.apache.avalon.meta.info.EntryDescriptor;
import org.apache.avalon.util.i18n.ResourceManager;
1.17 +1 -9 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java
Index: DefaultComponentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultComponentModel.java 13 Mar 2004 23:26:57 -0000 1.16
+++ DefaultComponentModel.java 17 Mar 2004 10:39:10 -0000 1.17
@@ -17,12 +17,10 @@
package org.apache.avalon.composition.model.impl;
-import java.util.List;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Properties;
import java.lang.reflect.Constructor;
-import java.security.AccessControlContext;
import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.DependencyDirective;
@@ -30,22 +28,16 @@
import org.apache.avalon.composition.data.ContextDirective;
import org.apache.avalon.composition.data.Mode;
import org.apache.avalon.composition.info.DeliveryDescriptor;
-import org.apache.avalon.composition.info.NativeDeliveryDescriptor;
import org.apache.avalon.composition.info.StagedDeliveryDescriptor;
-import org.apache.avalon.composition.model.AssemblyException;
import org.apache.avalon.composition.model.ContextModel;
import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.ModelRepository;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.StageModel;
-import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.ComponentContext;
import org.apache.avalon.composition.provider.SecurityModel;
-
-import org.apache.avalon.logging.data.CategoriesDirective;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
1.7 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java
Index: DefaultStageModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultStageModel.java 8 Mar 2004 11:28:36 -0000 1.6
+++ DefaultStageModel.java 17 Mar 2004 10:39:10 -0000 1.7
@@ -24,7 +24,6 @@
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.ModelException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.StageDescriptor;
1.16 +1 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
Index: DefaultContextModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultContextModel.java 13 Mar 2004 23:26:57 -0000 1.15
+++ DefaultContextModel.java 17 Mar 2004 10:39:10 -0000 1.16
@@ -32,15 +32,11 @@
import org.apache.avalon.composition.info.NativeDeliveryDescriptor;
import org.apache.avalon.composition.model.EntryModel;
import org.apache.avalon.composition.model.ContextModel;
-import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.provider.ComponentContext;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.ContextDescriptor;
1.9 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java
Index: Scanner.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Scanner.java 8 Mar 2004 11:28:36 -0000 1.8
+++ Scanner.java 17 Mar 2004 10:39:10 -0000 1.9
@@ -38,7 +38,6 @@
import org.apache.avalon.meta.info.Service;
import org.apache.avalon.meta.info.ServiceDescriptor;
-import org.apache.avalon.meta.info.PermissionDescriptor;
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.meta.info.builder.TypeBuilder;
import org.apache.avalon.meta.info.builder.ServiceBuilder;
1.5 +1 -18 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelComponentHelper.java
Index: DefaultContainmentModelComponentHelper.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelComponentHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContainmentModelComponentHelper.java 8 Mar 2004 11:28:36 -0000 1.4
+++ DefaultContainmentModelComponentHelper.java 17 Mar 2004 10:39:10 -0000 1.5
@@ -18,35 +18,18 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
import org.apache.avalon.composition.data.ComponentProfile;
-import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.ClassLoaderDirective;
-import org.apache.avalon.composition.data.builder.ContainmentProfileBuilder;
-import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
-import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.DependencyGraph;
-import org.apache.avalon.composition.provider.ModelFactory;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.ContainmentContext;
import org.apache.avalon.composition.provider.ComponentContext;
-import org.apache.avalon.composition.provider.ClassLoaderContext;
-import org.apache.avalon.composition.provider.SecurityModel;
import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.repository.Repository;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.Type;
1.9 +1 -8 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java
Index: DefaultContainmentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultContainmentContext.java 11 Mar 2004 01:30:38 -0000 1.8
+++ DefaultContainmentContext.java 17 Mar 2004 10:39:10 -0000 1.9
@@ -24,17 +24,10 @@
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ModelRepository;
-import org.apache.avalon.composition.model.ModelRuntimeException;
-import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.ContainmentContext;
-import org.apache.avalon.composition.provider.SecurityModel;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
-
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.3 +1 -7 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ContainmentContext.java
Index: ContainmentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ContainmentContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainmentContext.java 29 Feb 2004 22:25:26 -0000 1.2
+++ ContainmentContext.java 17 Mar 2004 10:39:11 -0000 1.3
@@ -19,16 +19,10 @@
import java.io.File;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
-
import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ModelRepository;
import org.apache.avalon.composition.model.ContainmentModel;
-
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
/**
* Defintion of a working context.
1.5 +1 -2 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContext.java
Index: SystemContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SystemContext.java 29 Feb 2004 22:25:26 -0000 1.4
+++ SystemContext.java 17 Mar 2004 10:39:11 -0000 1.5
@@ -27,7 +27,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.Parameters;
/**
* Defintion of a system context that exposes a system wide set of parameters.
1.3 +1 -4 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SecurityModel.java
Index: SecurityModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SecurityModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityModel.java 29 Feb 2004 22:25:26 -0000 1.2
+++ SecurityModel.java 17 Mar 2004 10:39:11 -0000 1.3
@@ -17,10 +17,7 @@
package org.apache.avalon.composition.provider;
-import java.security.Permission;
import java.security.Permissions;
-
-import org.apache.avalon.composition.data.GrantDirective;
/**
1.6 +1 -2 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContextFactory.java
Index: SystemContextFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContextFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SystemContextFactory.java 7 Mar 2004 00:00:59 -0000 1.5
+++ SystemContextFactory.java 17 Mar 2004 10:39:11 -0000 1.6
@@ -20,7 +20,6 @@
import java.io.File;
import java.util.Map;
-import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.SecurityProfile;
import org.apache.avalon.logging.provider.LoggingManager;
1.2 +1 -3 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ModelFactory.java
Index: ModelFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ModelFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelFactory.java 10 Feb 2004 16:23:35 -0000 1.1
+++ ModelFactory.java 17 Mar 2004 10:39:11 -0000 1.2
@@ -18,9 +18,7 @@
package org.apache.avalon.composition.provider;
import java.net.URL;
-import java.io.File;
-import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ComponentModel;
1.4 +1 -7 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ComponentContext.java
Index: ComponentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ComponentContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentContext.java 11 Mar 2004 01:30:38 -0000 1.3
+++ ComponentContext.java 17 Mar 2004 10:39:11 -0000 1.4
@@ -21,14 +21,8 @@
import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.EntryModel;
-
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.ContextDescriptor;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
/**
1.5 +0 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexComponent.java
Index: ComplexComponent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexComponent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComplexComponent.java 10 Feb 2004 16:23:35 -0000 1.4
+++ ComplexComponent.java 17 Mar 2004 10:39:11 -0000 1.5
@@ -20,7 +20,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
1.2 +1 -2 avalon/merlin/facilities/finder/impl/src/test/org/apache/avalon/finder/impl/test/DefaultFinderTestCase.java
Index: DefaultFinderTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/impl/src/test/org/apache/avalon/finder/impl/test/DefaultFinderTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFinderTestCase.java 7 Mar 2004 22:05:49 -0000 1.1
+++ DefaultFinderTestCase.java 17 Mar 2004 10:39:11 -0000 1.2
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
import org.apache.avalon.finder.Finder;
-import org.apache.avalon.finder.FinderException;
import org.apache.avalon.finder.impl.DefaultFinder;
/**
1.5 +1 -4 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelContext.java
Index: KernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KernelContext.java 24 Feb 2004 22:18:22 -0000 1.4
+++ KernelContext.java 17 Mar 2004 10:39:11 -0000 1.5
@@ -17,9 +17,6 @@
package org.apache.avalon.merlin;
-import java.net.URL;
-import java.io.File;
-
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.model.ContainmentModel;
1.8 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java
Index: XMLComponentProfileCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLComponentProfileCreator.java 11 Mar 2004 01:30:38 -0000 1.7
+++ XMLComponentProfileCreator.java 17 Mar 2004 10:39:11 -0000 1.8
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.configuration.Configuration;
1.9 +1 -11 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java
Index: XMLTargetsCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLTargetsCreator.java 11 Mar 2004 01:30:38 -0000 1.8
+++ XMLTargetsCreator.java 17 Mar 2004 10:39:11 -0000 1.9
@@ -17,22 +17,12 @@
package org.apache.avalon.composition.data.builder;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.security.cert.CertificateException;
-
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.composition.data.GrantDirective;
-import org.apache.avalon.composition.data.CertsDirective;
-import org.apache.avalon.composition.data.PermissionDirective;
-import org.apache.avalon.composition.data.PKCS7Directive;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.Targets;
-import org.apache.avalon.composition.data.X509Directive;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
/**
* Handles internalization of an XML based description of a {@link Targets}
1.3 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLSecurityProfileBuilder.java
Index: XMLSecurityProfileBuilder.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLSecurityProfileBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLSecurityProfileBuilder.java 1 Mar 2004 17:06:16 -0000 1.2
+++ XMLSecurityProfileBuilder.java 17 Mar 2004 10:39:11 -0000 1.3
@@ -21,7 +21,6 @@
import java.io.InputStream;
import java.io.ByteArrayInputStream;
import java.net.URL;
-import java.security.Permission;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
1.7 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfileCreator.java
Index: XMLProfileCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfileCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLProfileCreator.java 11 Mar 2004 01:30:38 -0000 1.6
+++ XMLProfileCreator.java 17 Mar 2004 10:39:11 -0000 1.7
@@ -17,8 +17,6 @@
package org.apache.avalon.composition.data.builder;
-import java.util.ArrayList;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
1.12 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
Index: XMLContainmentProfileCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLContainmentProfileCreator.java 11 Mar 2004 01:30:38 -0000 1.11
+++ XMLContainmentProfileCreator.java 17 Mar 2004 10:39:11 -0000 1.12
@@ -18,12 +18,10 @@
package org.apache.avalon.composition.data.builder;
import java.io.IOException;
-import java.security.Policy;
import java.security.cert.CertificateException;
import java.util.ArrayList;
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.composition.data.BlockCompositionDirective;
import org.apache.avalon.composition.data.BlockIncludeDirective;
1.5 +1 -12 avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/ContainmentModelHandler.java
Index: ContainmentModelHandler.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/ContainmentModelHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainmentModelHandler.java 24 Feb 2004 22:18:22 -0000 1.4
+++ ContainmentModelHandler.java 17 Mar 2004 10:39:11 -0000 1.5
@@ -17,24 +17,13 @@
package org.apache.avalon.http.impl;
-import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.http.HttpRuntimeException;
-import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.http.HttpContext;
-import org.mortbay.http.HttpRequest;
-import org.mortbay.http.HttpResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
/**
* The ContainmentModelHandler handles holders relative to a container
1.7 +0 -5 avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java
Index: DefaultServer.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultServer.java 24 Feb 2004 22:18:22 -0000 1.6
+++ DefaultServer.java 17 Mar 2004 10:39:11 -0000 1.7
@@ -20,7 +20,6 @@
import java.io.File;
import java.net.UnknownHostException;
-import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.context.Context;
@@ -35,7 +34,6 @@
import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.http.HttpService;
@@ -43,11 +41,8 @@
import org.mortbay.http.SocketListener;
import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpListener;
-import org.mortbay.http.handler.ResourceHandler;
import org.mortbay.http.SunJsseListener;
import org.mortbay.http.ajp.AJP13Listener;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.util.Log;
/**
1.6 +0 -7 avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/ComponentModelHolder.java
Index: ComponentModelHolder.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/ComponentModelHolder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentModelHolder.java 24 Feb 2004 22:18:22 -0000 1.5
+++ ComponentModelHolder.java 17 Mar 2004 10:39:11 -0000 1.6
@@ -20,20 +20,13 @@
import java.io.IOException;
import javax.servlet.GenericServlet;
-import javax.servlet.Servlet;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.ServletException;
-import javax.servlet.ServletConfig;
import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.Resolver;
-import org.apache.avalon.http.HttpRuntimeException;
import org.apache.avalon.http.Handler;
-import org.apache.avalon.http.HandlerException;
import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.ServletHandler;
1.4 +0 -3 avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultModelListener.java
Index: DefaultModelListener.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultModelListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultModelListener.java 24 Feb 2004 22:18:22 -0000 1.3
+++ DefaultModelListener.java 17 Mar 2004 10:39:11 -0000 1.4
@@ -17,15 +17,12 @@
package org.apache.avalon.http.impl;
-import javax.servlet.Servlet;
-
import org.apache.avalon.composition.event.CompositionEvent;
import org.apache.avalon.composition.event.CompositionListener;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
1.4 +1 -3 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/KernelStateEvent.java
Index: KernelStateEvent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/KernelStateEvent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KernelStateEvent.java 24 Feb 2004 22:18:22 -0000 1.3
+++ KernelStateEvent.java 17 Mar 2004 10:39:11 -0000 1.4
@@ -17,8 +17,6 @@
package org.apache.avalon.merlin.event;
-import java.util.EventObject;
-
import org.apache.avalon.merlin.Kernel;
/**
1.2 +0 -2 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CommissionerTestCase.java
Index: CommissionerTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CommissionerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommissionerTestCase.java 10 Feb 2004 16:23:35 -0000 1.1
+++ CommissionerTestCase.java 17 Mar 2004 10:39:11 -0000 1.2
@@ -17,8 +17,6 @@
package org.apache.avalon.composition.model.impl;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.avalon.composition.model.CommissioningException;
import org.apache.avalon.composition.model.FatalCommissioningException;
import org.apache.avalon.composition.model.DeploymentModel;
1.4 +1 -6 avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm/DefaultRoleManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRoleManager.java 12 Mar 2004 08:00:42 -0000 1.3
+++ DefaultRoleManager.java 17 Mar 2004 10:39:12 -0000 1.4
@@ -17,13 +17,8 @@
package org.apache.avalon.finder.ecm;
-import org.apache.avalon.finder.Finder;
-import org.apache.avalon.finder.FinderException;
-
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.finder.ecm.info.Role;
import org.apache.avalon.finder.ecm.info.Hint;
1.2 +1 -8 avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm/RoleManager.java
Index: RoleManager.java
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm/RoleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleManager.java 8 Mar 2004 01:36:08 -0000 1.1
+++ RoleManager.java 17 Mar 2004 10:39:12 -0000 1.2
@@ -17,13 +17,6 @@
package org.apache.avalon.finder.ecm;
-import org.apache.avalon.finder.Finder;
-import org.apache.avalon.finder.FinderException;
-
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-
import org.apache.avalon.finder.ecm.info.Role;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org