You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/10/28 21:21:02 UTC
cvs commit: avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit AbstractMerlinTestCase.java DefaultEmbeddedKernel.java
mcconnell 2003/10/28 12:21:02
Modified: merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
ContainmentProfileBuilder.java
ProfilePackageBuilder.java TargetsBuilder.java
XMLContainmentProfileCreator.java
XMLDeploymentProfileCreator.java
XMLTargetsCreator.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer
XMLContainmentProfileWriter.java
XMLDeploymentProfileWriter.java
merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl
DefaultLoggingManager.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultClassLoaderContext.java
DefaultClassLoaderModel.java
DefaultConstructorModel.java
DefaultContainmentContext.java
DefaultContainmentModel.java DefaultContext.java
DefaultContextModel.java
DefaultDependencyModel.java
DefaultDeploymentContext.java
DefaultDeploymentModel.java DefaultEntryModel.java
DefaultImportModel.java DefaultModelFactory.java
DefaultProfileSelector.java
DefaultServiceRepository.java
DefaultStageModel.java DefaultSystemContext.java
DefaultTypeRepository.java Scanner.java
merlin/composition/impl/src/test/org/apache/avalon/composition/data
DataTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/data/test
ConstructorDirectiveTestCase.java
DeploymentProfileTestCase.java
ImportDirectiveTestCase.java ParameterTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model
AbstractTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
ContextTestCase.java DependencyTestCase.java
IncludesTestCase.java TargetsTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/testb
TestB.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/testc
TestC.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/testd
TestD.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/teste
TestE.java
merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder
ProfilePackageCreator.java
merlin/kernel/bootstrap/src/java Merlin.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel
KernelContext.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
CLIKernelLoader.java DefaultKernel.java
DefaultKernelContext.java DefaultLoader.java
merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
DefaultEmbeddedKernel.java
Log:
Applying patches from Alex Karasulu.
Revision Changes Path
1.3 +1 -6 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java
Index: ContainmentProfileBuilder.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainmentProfileBuilder.java 4 Oct 2003 11:53:04 -0000 1.2
+++ ContainmentProfileBuilder.java 28 Oct 2003 20:21:00 -0000 1.3
@@ -55,15 +55,10 @@
import java.io.ByteArrayOutputStream;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.meta.ConfigurationBuilder;
-import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.DeploymentProfile;
-import org.apache.avalon.composition.data.MetaDataException;
-import org.apache.avalon.composition.data.MetaDataRuntimeException;
import org.xml.sax.InputSource;
1.2 +1 -4 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java
Index: ProfilePackageBuilder.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfilePackageBuilder.java 24 Sep 2003 09:31:25 -0000 1.1
+++ ProfilePackageBuilder.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -53,12 +53,9 @@
import java.io.InputStream;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.meta.ConfigurationBuilder;
import org.apache.avalon.composition.data.ProfilePackage;
import org.apache.avalon.composition.data.DeploymentProfile;
-import org.apache.avalon.composition.data.MetaDataException;
import org.xml.sax.InputSource;
1.2 +1 -4 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java
Index: TargetsBuilder.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TargetsBuilder.java 24 Sep 2003 09:31:35 -0000 1.1
+++ TargetsBuilder.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -57,9 +57,6 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.meta.ConfigurationBuilder;
import org.apache.avalon.composition.data.Targets;
-import org.apache.avalon.composition.data.TargetDirective;
-import org.apache.avalon.composition.data.MetaDataException;
-import org.apache.avalon.composition.data.MetaDataRuntimeException;
import org.apache.avalon.composition.data.builder.TargetsCreator;
import org.xml.sax.InputSource;
1.3 +1 -11 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLContainmentProfileCreator.java 4 Oct 2003 11:53:04 -0000 1.2
+++ XMLContainmentProfileCreator.java 28 Oct 2003 20:21:00 -0000 1.3
@@ -55,9 +55,6 @@
package org.apache.avalon.composition.data.builder;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
import org.apache.avalon.composition.data.BlockCompositionDirective;
@@ -66,13 +63,10 @@
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.avalon.composition.data.ClasspathDirective;
import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.FilesetDirective;
import org.apache.avalon.composition.data.IncludeDirective;
import org.apache.avalon.composition.data.LibraryDirective;
-import org.apache.avalon.composition.data.Mode;
import org.apache.avalon.composition.data.MetaDataException;
-import org.apache.avalon.composition.data.MetaDataRuntimeException;
import org.apache.avalon.composition.data.NamedDeploymentProfile;
import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.data.RepositoryDirective;
@@ -82,10 +76,6 @@
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.builder.XMLTypeCreator;
import org.apache.excalibur.configuration.ConfigurationUtil;
1.5 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java
Index: XMLDeploymentProfileCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDeploymentProfileCreator.java 19 Oct 2003 10:31:01 -0000 1.4
+++ XMLDeploymentProfileCreator.java 28 Oct 2003 20:21:00 -0000 1.5
@@ -60,7 +60,6 @@
import org.apache.avalon.composition.data.SelectionDirective;
import org.apache.avalon.composition.data.*;
import org.apache.avalon.meta.info.InfoDescriptor;
-import org.apache.excalibur.configuration.ConfigurationUtil;
/**
*
1.2 +1 -9 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLTargetsCreator.java 24 Sep 2003 09:31:43 -0000 1.1
+++ XMLTargetsCreator.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -55,18 +55,10 @@
package org.apache.avalon.composition.data.builder;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.Targets;
-import org.apache.avalon.composition.data.builder.TargetsCreator;
/**
* Handles internalization of an XML based description of a {@link Targets}
1.2 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java
Index: XMLContainmentProfileWriter.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLContainmentProfileWriter.java 24 Sep 2003 09:31:45 -0000 1.1
+++ XMLContainmentProfileWriter.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -67,7 +67,6 @@
import org.apache.avalon.composition.data.ServiceDirective;
import org.apache.avalon.composition.data.FilesetDirective;
import org.apache.avalon.composition.data.IncludeDirective;
-import org.apache.avalon.meta.info.DependencyDescriptor;
/**
* Write {@link ContainmentProfile} objects to a stream as xml documents.
1.4 +1 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLDeploymentProfileWriter.java
Index: XMLDeploymentProfileWriter.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLDeploymentProfileWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDeploymentProfileWriter.java 19 Oct 2003 10:31:01 -0000 1.3
+++ XMLDeploymentProfileWriter.java 28 Oct 2003 20:21:00 -0000 1.4
@@ -50,15 +50,11 @@
package org.apache.avalon.composition.data.writer;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.io.Writer;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.composition.data.Profile;
-import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.ContextDirective;
import org.apache.avalon.composition.data.DependencyDirective;
1.3 +0 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl/DefaultLoggingManager.java
Index: DefaultLoggingManager.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl/DefaultLoggingManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoggingManager.java 13 Oct 2003 14:11:25 -0000 1.2
+++ DefaultLoggingManager.java 28 Oct 2003 20:21:00 -0000 1.3
@@ -61,9 +61,7 @@
import org.apache.avalon.composition.logging.TargetProvider;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.composition.data.CategoryDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.log.Hierarchy;
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultClassLoaderContext.java 24 Sep 2003 09:31:52 -0000 1.1
+++ DefaultClassLoaderContext.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -54,7 +54,6 @@
import java.net.URL;
import org.apache.avalon.composition.model.ClassLoaderContext;
-import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.TypeRepository;
import org.apache.avalon.composition.model.ServiceRepository;
import org.apache.avalon.repository.Repository;
1.2 +1 -12 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
Index: DefaultClassLoaderModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultClassLoaderModel.java 24 Sep 2003 09:31:54 -0000 1.1
+++ DefaultClassLoaderModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -53,8 +53,6 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.List;
import java.util.jar.Manifest;
import java.net.JarURLConnection;
@@ -63,20 +61,15 @@
import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.data.ClassLoaderDirective;
-import org.apache.avalon.composition.data.ClasspathDirective;
import org.apache.avalon.composition.data.FilesetDirective;
import org.apache.avalon.composition.data.IncludeDirective;
import org.apache.avalon.composition.data.RepositoryDirective;
import org.apache.avalon.composition.data.ResourceDirective;
-import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.model.ClassLoaderContext;
import org.apache.avalon.composition.model.ClassLoaderModel;
-import org.apache.avalon.composition.model.SystemContext;
import org.apache.avalon.composition.model.TypeRepository;
import org.apache.avalon.composition.model.ServiceRepository;
-import org.apache.avalon.composition.model.TypeUnknownException;
import org.apache.avalon.composition.model.ModelException;
-import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.extension.Extension;
@@ -89,10 +82,6 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
-import org.apache.avalon.meta.info.Type;
/**
* <p>Implementation of a classloader model within which a
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultConstructorModel.java 24 Sep 2003 09:31:56 -0000 1.1
+++ DefaultConstructorModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -57,9 +57,7 @@
import org.apache.avalon.composition.model.DeploymentContext;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.composition.data.EntryDirective;
import org.apache.avalon.composition.data.ConstructorDirective;
import org.apache.avalon.composition.data.Parameter;
import org.apache.avalon.meta.info.EntryDescriptor;
1.2 +1 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultContainmentContext.java 24 Sep 2003 09:31:56 -0000 1.1
+++ DefaultContainmentContext.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -51,12 +51,10 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.util.Map;
import org.apache.avalon.composition.model.SystemContext;
import org.apache.avalon.composition.model.ContainmentContext;
import org.apache.avalon.composition.model.ClassLoaderModel;
-import org.apache.avalon.composition.model.TypeRepository;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.excalibur.i18n.ResourceManager;
1.5 +1 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContainmentModel.java 12 Oct 2003 17:12:45 -0000 1.4
+++ DefaultContainmentModel.java 28 Oct 2003 20:21:00 -0000 1.5
@@ -55,10 +55,8 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.net.URLConnection;
import java.util.Hashtable;
-import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -82,7 +80,6 @@
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ModelException;
-import org.apache.avalon.composition.model.SystemContext;
import org.apache.avalon.composition.model.ModelSelector;
import org.apache.avalon.composition.model.ProfileSelector;
import org.apache.avalon.composition.model.TypeRepository;
@@ -99,7 +96,6 @@
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
-import org.apache.excalibur.configuration.ConfigurationUtil;
/**
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultContext.java 24 Sep 2003 09:32:00 -0000 1.1
+++ DefaultContext.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -56,7 +56,6 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.meta.info.EntryDescriptor;
/**
* <p>Default implementation of a context object. The implementation
1.2 +1 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultContextModel.java 24 Sep 2003 09:32:01 -0000 1.1
+++ DefaultContextModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -57,11 +57,9 @@
import org.apache.avalon.composition.model.ContextModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.DeploymentContext;
-import org.apache.avalon.composition.model.SystemContext;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
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;
1.2 +1 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDependencyModel.java 24 Sep 2003 09:32:02 -0000 1.1
+++ DefaultDependencyModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -50,16 +50,9 @@
package org.apache.avalon.composition.model.impl;
-import java.io.File;
import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Map;
-import org.apache.avalon.composition.model.DeploymentContext;
import org.apache.avalon.composition.model.DependencyModel;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.data.DependencyDirective;
import org.apache.avalon.composition.data.SelectionDirective;
1.2 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java
Index: DefaultDeploymentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDeploymentContext.java 24 Sep 2003 09:32:03 -0000 1.1
+++ DefaultDeploymentContext.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -58,7 +58,6 @@
import org.apache.avalon.composition.model.EntryModel;
import org.apache.avalon.composition.model.ContainmentContext;
import org.apache.avalon.composition.model.DeploymentContext;
-import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.ContextException;
1.5 +1 -11 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultDeploymentModel.java 19 Oct 2003 10:31:01 -0000 1.4
+++ DefaultDeploymentModel.java 28 Oct 2003 20:21:00 -0000 1.5
@@ -50,37 +50,28 @@
package org.apache.avalon.composition.model.impl;
-import java.io.File;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Map;
import org.apache.avalon.composition.model.ContextModel;
import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.DeploymentContext;
-import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.SystemContext;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.data.DependencyDirective;
import org.apache.avalon.composition.data.StageDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
-import org.apache.avalon.repository.Repository;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.data.ContextDirective;
-import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.Mode;
import org.apache.avalon.meta.info.ContextDescriptor;
import org.apache.avalon.meta.info.DependencyDescriptor;
@@ -88,7 +79,6 @@
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
-import org.apache.avalon.meta.info.builder.TypeBuilder;
import org.apache.excalibur.configuration.CascadingConfiguration;
/**
1.2 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultEntryModel.java
Index: DefaultEntryModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultEntryModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultEntryModel.java 24 Sep 2003 09:32:09 -0000 1.1
+++ DefaultEntryModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -50,7 +50,6 @@
package org.apache.avalon.composition.model.impl;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.composition.model.EntryModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.meta.info.EntryDescriptor;
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultImportModel.java 24 Sep 2003 09:32:09 -0000 1.1
+++ DefaultImportModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -56,11 +56,8 @@
import org.apache.avalon.composition.model.DeploymentContext;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.composition.data.EntryDirective;
import org.apache.avalon.composition.data.ImportDirective;
-import org.apache.avalon.composition.data.ConstructorDirective;
import org.apache.avalon.meta.info.EntryDescriptor;
1.3 +1 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultModelFactory.java 4 Oct 2003 11:53:04 -0000 1.2
+++ DefaultModelFactory.java 28 Oct 2003 20:21:00 -0000 1.3
@@ -67,7 +67,6 @@
import org.apache.avalon.repository.Repository;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.extension.manager.OptionalPackage;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
1.2 +1 -3 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java
Index: DefaultProfileSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultProfileSelector.java 24 Sep 2003 09:32:12 -0000 1.1
+++ DefaultProfileSelector.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -55,8 +55,6 @@
package org.apache.avalon.composition.model.impl;
-import java.util.ArrayList;
-
import org.apache.avalon.composition.model.ProfileSelector;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
1.2 +1 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java
Index: DefaultServiceRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultServiceRepository.java 24 Sep 2003 09:32:12 -0000 1.1
+++ DefaultServiceRepository.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -50,19 +50,15 @@
package org.apache.avalon.composition.model.impl;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.avalon.composition.model.ServiceDuplicateException;
-import org.apache.avalon.composition.model.ServiceException;
import org.apache.avalon.composition.model.ServiceUnknownException;
import org.apache.avalon.composition.model.ServiceRepository;
import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.Service;
-import org.apache.avalon.meta.info.builder.ServiceBuilder;
/**
* A service repository provides support for the retrival
1.2 +1 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultStageModel.java 24 Sep 2003 09:32:13 -0000 1.1
+++ DefaultStageModel.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -50,16 +50,9 @@
package org.apache.avalon.composition.model.impl;
-import java.io.File;
import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Map;
-import org.apache.avalon.composition.model.DeploymentContext;
import org.apache.avalon.composition.model.StageModel;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.data.StageDirective;
import org.apache.avalon.composition.data.SelectionDirective;
1.2 +1 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultSystemContext.java 24 Sep 2003 09:32:14 -0000 1.1
+++ DefaultSystemContext.java 28 Oct 2003 20:21:00 -0000 1.2
@@ -51,9 +51,7 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.util.Map;
import java.net.URL;
-import java.net.URLClassLoader;
import org.apache.avalon.composition.logging.LoggingManager;
import org.apache.avalon.composition.logging.LoggingDescriptor;
@@ -65,7 +63,6 @@
import org.apache.avalon.repository.impl.DefaultFileRepository;
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.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.context.DefaultContext;
1.3 +1 -7 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
Index: DefaultTypeRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultTypeRepository.java 4 Oct 2003 11:53:04 -0000 1.2
+++ DefaultTypeRepository.java 28 Oct 2003 20:21:00 -0000 1.3
@@ -51,15 +51,11 @@
package org.apache.avalon.composition.model.impl;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import org.apache.avalon.composition.model.TypeRepository;
-import org.apache.avalon.composition.model.TypeException;
-import org.apache.avalon.composition.model.TypeRuntimeException;
-import org.apache.avalon.composition.model.TypeDuplicateException;
import org.apache.avalon.composition.model.TypeUnknownException;
import org.apache.avalon.composition.model.ProfileUnknownException;
import org.apache.avalon.excalibur.i18n.ResourceManager;
@@ -71,8 +67,6 @@
import org.apache.avalon.composition.data.builder.ProfilePackageBuilder;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ReferenceDescriptor;
-import org.apache.avalon.meta.info.ServiceDescriptor;
-import org.apache.avalon.meta.info.ExtensionDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
1.3 +1 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Scanner.java 19 Oct 2003 14:05:11 -0000 1.2
+++ Scanner.java 28 Oct 2003 20:21:00 -0000 1.3
@@ -56,7 +56,6 @@
package org.apache.avalon.composition.model.impl;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
@@ -64,7 +63,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Map;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
import java.util.zip.ZipEntry;
@@ -75,13 +73,10 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.composition.data.Profile;
-import org.apache.avalon.composition.data.ProfilePackage;
import org.apache.avalon.composition.data.builder.ProfilePackageBuilder;
import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.meta.info.Service;
import org.apache.avalon.meta.info.ServiceDescriptor;
-import org.apache.avalon.meta.info.ExtensionDescriptor;
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.meta.info.builder.TypeBuilder;
import org.apache.avalon.meta.info.builder.ServiceBuilder;
1.2 +0 -2 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/DataTestCase.java
Index: DataTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/DataTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataTestCase.java 24 Sep 2003 09:32:23 -0000 1.1
+++ DataTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,14 +3,12 @@
package org.apache.avalon.composition.data;
import java.io.File;
-import java.io.IOException;
import java.io.FileOutputStream;
import java.io.FileInputStream;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.builder.ContainmentProfileBuilder;
import org.apache.avalon.composition.data.builder.SerializedContainmentProfileCreator;
import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
import org.apache.avalon.composition.data.writer.SerializedContainmentProfileWriter;
1.2 +0 -3 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ConstructorDirectiveTestCase.java
Index: ConstructorDirectiveTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ConstructorDirectiveTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConstructorDirectiveTestCase.java 24 Sep 2003 09:32:25 -0000 1.1
+++ ConstructorDirectiveTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -52,10 +52,7 @@
import junit.framework.TestCase;
import org.apache.avalon.composition.data.MetaDataException;
import org.apache.avalon.composition.data.Parameter;
-import org.apache.avalon.composition.data.EntryDirective;
import org.apache.avalon.composition.data.ConstructorDirective;
-
-import java.util.HashMap;
/**
* ConstructorDirectiveTestCase does XYZ
1.4 +0 -5 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/DeploymentProfileTestCase.java
Index: DeploymentProfileTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/DeploymentProfileTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeploymentProfileTestCase.java 19 Oct 2003 10:31:01 -0000 1.3
+++ DeploymentProfileTestCase.java 28 Oct 2003 20:21:01 -0000 1.4
@@ -55,12 +55,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.Version;
-
-import java.util.Properties;
/**
* ProfileTestCase does XYZ
1.2 +0 -3 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ImportDirectiveTestCase.java
Index: ImportDirectiveTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ImportDirectiveTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImportDirectiveTestCase.java 24 Sep 2003 09:32:26 -0000 1.1
+++ ImportDirectiveTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -52,9 +52,6 @@
import junit.framework.TestCase;
import org.apache.avalon.composition.data.MetaDataException;
import org.apache.avalon.composition.data.ImportDirective;
-import org.apache.avalon.composition.data.EntryDirective;
-
-import java.util.HashMap;
/**
* ImportDirectiveTestCase does XYZ
1.2 +0 -4 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ParameterTestCase.java
Index: ParameterTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ParameterTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParameterTestCase.java 24 Sep 2003 09:32:27 -0000 1.1
+++ ParameterTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -53,10 +53,6 @@
import org.apache.avalon.composition.data.Parameter;
import org.apache.avalon.composition.data.MetaDataException;
-import java.util.Map;
-import java.util.HashMap;
-import java.lang.reflect.Constructor;
-
/**
* ParameterTestCase does XYZ
*
1.2 +0 -19 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTestCase.java 24 Sep 2003 09:32:27 -0000 1.1
+++ AbstractTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,29 +3,10 @@
package org.apache.avalon.composition.model;
import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.lang.reflect.Method;
-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.ModelRuntimeException;
-import org.apache.avalon.composition.model.impl.DefaultModelFactory;
import org.apache.avalon.composition.model.impl.DefaultSystemContext;
-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.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.ClassLoaderDirective;
-import org.apache.avalon.composition.data.CategoryDirective;
-import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
import junit.framework.TestCase;
1.2 +1 -8 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
Index: ContextTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextTestCase.java 24 Sep 2003 09:32:27 -0000 1.1
+++ ContextTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,20 +3,13 @@
package org.apache.avalon.composition.model.test;
import java.io.File;
-import java.io.IOException;
-import java.net.URL;
import java.util.Date;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ContextModel;
import org.apache.avalon.composition.model.AbstractTestCase;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.ServiceDescriptor;
-import org.apache.avalon.composition.model.testa.Facade;
public class ContextTestCase extends AbstractTestCase
{
@@ -118,7 +111,7 @@
date = (Date) context.get( "time" );
try
{
- Thread.currentThread().sleep( 1200 );
+ Thread.sleep( 1200 );
}
catch( Throwable e )
{
1.2 +0 -7 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DependencyTestCase.java
Index: DependencyTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DependencyTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyTestCase.java 24 Sep 2003 09:32:27 -0000 1.1
+++ DependencyTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -2,17 +2,10 @@
package org.apache.avalon.composition.model.test;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.AbstractTestCase;
-import org.apache.avalon.meta.info.DependencyDescriptor;
public class DependencyTestCase extends AbstractTestCase
{
1.2 +0 -9 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IncludesTestCase.java 24 Sep 2003 09:32:27 -0000 1.1
+++ IncludesTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -2,18 +2,9 @@
package org.apache.avalon.composition.model.test;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.AbstractTestCase;
import org.apache.avalon.composition.util.ExceptionHelper;
-import org.apache.avalon.meta.info.DependencyDescriptor;
public class IncludesTestCase extends AbstractTestCase
{
1.2 +0 -6 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java
Index: TargetsTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TargetsTestCase.java 24 Sep 2003 09:32:27 -0000 1.1
+++ TargetsTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,14 +3,9 @@
package org.apache.avalon.composition.model.test;
import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
import org.apache.avalon.composition.model.Model;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.AbstractTestCase;
import org.apache.avalon.composition.data.Targets;
import org.apache.avalon.composition.data.TargetDirective;
@@ -19,7 +14,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.excalibur.configuration.ConfigurationUtil;
-import org.apache.avalon.meta.info.DependencyDescriptor;
public class TargetsTestCase extends AbstractTestCase
{
1.2 +0 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testb/TestB.java
Index: TestB.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testb/TestB.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestB.java 24 Sep 2003 09:32:28 -0000 1.1
+++ TestB.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,7 +3,6 @@
package org.apache.avalon.composition.model.testb;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
public class TestB extends AbstractLogEnabled
1.2 +5 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testc/TestC.java
Index: TestC.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testc/TestC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestC.java 24 Sep 2003 09:32:28 -0000 1.1
+++ TestC.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,12 +3,16 @@
package org.apache.avalon.composition.model.testc;
import org.apache.avalon.framework.activity.Initializable;
-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.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+
+//
+// TODO check why we are importing and implementing Serviceable
+// but its not in the class definition
+//
public class TestC extends AbstractLogEnabled
implements Initializable, C
1.2 +5 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testd/TestD.java
Index: TestD.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testd/TestD.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestD.java 24 Sep 2003 09:32:28 -0000 1.1
+++ TestD.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,12 +3,16 @@
package org.apache.avalon.composition.model.testd;
import org.apache.avalon.framework.activity.Initializable;
-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.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+
+//
+// TODO check why we are importing and implementing Serviceable
+// but its not in the class definition
+//
public class TestD extends AbstractLogEnabled
implements Initializable, D
1.2 +5 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/teste/TestE.java
Index: TestE.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/teste/TestE.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestE.java 24 Sep 2003 09:32:28 -0000 1.1
+++ TestE.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -3,12 +3,16 @@
package org.apache.avalon.composition.model.teste;
import org.apache.avalon.framework.activity.Initializable;
-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.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+
+//
+// TODO check why we are importing and implementing Serviceable
+// but its not in the class definition
+//
public class TestE extends AbstractLogEnabled
implements Initializable, E
1.2 +1 -3 avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder/ProfilePackageCreator.java
Index: ProfilePackageCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder/ProfilePackageCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfilePackageCreator.java 24 Sep 2003 09:32:29 -0000 1.1
+++ ProfilePackageCreator.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -50,9 +50,7 @@
package org.apache.avalon.composition.data.builder;
-import java.io.InputStream;
import org.apache.avalon.composition.data.ProfilePackage;
-import org.apache.avalon.meta.info.Type;
/**
* Interface used to create a {@link ProfilePackage}
1.3 +0 -8 avalon/merlin/kernel/bootstrap/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/java/Merlin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Merlin.java 7 Oct 2003 17:44:09 -0000 1.2
+++ Merlin.java 28 Oct 2003 20:21:01 -0000 1.3
@@ -49,20 +49,12 @@
*/
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
1.2 +0 -1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/KernelContext.java
Index: KernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/KernelContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KernelContext.java 12 Oct 2003 15:23:53 -0000 1.1
+++ KernelContext.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -7,7 +7,6 @@
import org.apache.avalon.repository.Repository;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.logging.LoggingManager;
import org.apache.avalon.composition.model.ModelFactory;
1.2 +0 -5 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java
Index: CLIKernelLoader.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CLIKernelLoader.java 24 Sep 2003 09:32:56 -0000 1.1
+++ CLIKernelLoader.java 28 Oct 2003 20:21:01 -0000 1.2
@@ -4,25 +4,21 @@
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Map;
import java.util.Locale;
import java.net.MalformedURLException;
import java.net.URL;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
import org.apache.avalon.composition.util.ExceptionHelper;
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.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.merlin.kernel.Kernel;
import org.apache.avalon.merlin.kernel.KernelContext;
import org.apache.avalon.merlin.kernel.KernelException;
@@ -37,7 +33,6 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
import org.xml.sax.SAXException;
/**
1.6 +1 -23 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultKernel.java 17 Oct 2003 03:26:29 -0000 1.5
+++ DefaultKernel.java 28 Oct 2003 20:21:01 -0000 1.6
@@ -50,8 +50,6 @@
package org.apache.avalon.merlin.kernel.impl;
-import java.io.File;
-import java.io.InputStream;
import java.net.URL;
import javax.management.NotificationBroadcasterSupport;
import javax.management.AttributeChangeNotification;
@@ -64,37 +62,17 @@
import org.apache.avalon.merlin.kernel.KernelRuntimeException;
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.Block;
-import org.apache.avalon.activation.appliance.Engine;
import org.apache.avalon.activation.appliance.Composite;
-import org.apache.avalon.activation.appliance.ServiceContext;
-import org.apache.avalon.activation.appliance.UnknownServiceException;
import org.apache.avalon.activation.appliance.impl.DefaultBlock;
import org.apache.avalon.activation.appliance.impl.DefaultServiceContext;
import org.apache.avalon.composition.data.TargetDirective;
-import org.apache.avalon.composition.data.CategoryDirective;
-import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
import org.apache.avalon.composition.logging.LoggingManager;
-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.SystemContext;
-import org.apache.avalon.composition.model.ModelFactory;
-import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ContainmentContext;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.impl.DefaultSystemContext;
-import org.apache.avalon.composition.model.impl.DefaultModelFactory;
-import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.Version;
import org.apache.excalibur.mpool.PoolManager;
/**
1.4 +1 -6 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultKernelContext.java 12 Oct 2003 17:12:45 -0000 1.3
+++ DefaultKernelContext.java 28 Oct 2003 20:21:01 -0000 1.4
@@ -51,17 +51,13 @@
package org.apache.avalon.merlin.kernel.impl;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Properties;
-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.Targets;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.builder.XMLTargetsCreator;
import org.apache.avalon.composition.data.builder.XMLDeploymentProfileCreator;
@@ -74,7 +70,6 @@
import org.apache.avalon.composition.logging.impl.FileTargetProvider;
import org.apache.avalon.composition.model.ModelFactory;
import org.apache.avalon.composition.model.ContainmentContext;
-import org.apache.avalon.composition.model.impl.DefaultContainmentContext;
import org.apache.avalon.composition.model.impl.DefaultSystemContext;
import org.apache.avalon.composition.model.impl.DefaultModelFactory;
import org.apache.avalon.composition.util.StringHelper;
1.5 +0 -15 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultLoader.java
Index: DefaultLoader.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultLoader.java 24 Oct 2003 07:04:21 -0000 1.4
+++ DefaultLoader.java 28 Oct 2003 20:21:01 -0000 1.5
@@ -3,33 +3,18 @@
package org.apache.avalon.merlin.kernel.impl;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Map;
-import java.util.Locale;
-import java.net.MalformedURLException;
import java.net.URL;
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.Block;
import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.composition.model.ContainmentModel;
-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.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.merlin.kernel.Kernel;
-import org.apache.avalon.merlin.kernel.KernelContext;
import org.apache.avalon.merlin.kernel.KernelException;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.repository.BlockManifest;
import org.apache.avalon.repository.Repository;
-import org.xml.sax.SAXException;
/**
* The DefaultLoader loads a Merlin Kernel based on a supplied argument map.
1.2 +0 -8 avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
Index: MerlinBean.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MerlinBean.java 24 Sep 2003 09:33:21 -0000 1.1
+++ MerlinBean.java 28 Oct 2003 20:21:02 -0000 1.2
@@ -50,21 +50,13 @@
package org.apache.avalon.merlin.tools;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.impl.DefaultFileRepository;
import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.merlin.kernel.Kernel;
import org.apache.avalon.merlin.kernel.KernelException;
-import org.apache.avalon.merlin.kernel.KernelContext;
import org.apache.avalon.merlin.kernel.impl.DefaultKernel;
import org.apache.avalon.merlin.kernel.impl.DefaultKernelContext;
1.13 +1 -2 avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
Index: AbstractMerlinTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractMerlinTestCase.java 19 Oct 2003 00:02:02 -0000 1.12
+++ AbstractMerlinTestCase.java 28 Oct 2003 20:21:02 -0000 1.13
@@ -58,7 +58,6 @@
import org.apache.avalon.activation.appliance.Block;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.merlin.kernel.Kernel;
import org.apache.avalon.merlin.unit.DefaultEmbeddedKernel;
import junit.framework.TestCase;
@@ -210,7 +209,7 @@
{
try
{
- Thread.currentThread().sleep( 100 );
+ Thread.sleep( 100 );
}
catch( Throwable e )
{
1.4 +3 -5 avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java
Index: DefaultEmbeddedKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultEmbeddedKernel.java 24 Oct 2003 07:17:23 -0000 1.3
+++ DefaultEmbeddedKernel.java 28 Oct 2003 20:21:02 -0000 1.4
@@ -56,11 +56,9 @@
import java.util.ArrayList;
import java.util.StringTokenizer;
import java.util.Properties;
-import java.util.Hashtable;
import java.util.Map;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import org.apache.avalon.activation.appliance.Block;
import org.apache.avalon.composition.model.ContainmentModel;
@@ -218,7 +216,7 @@
{
try
{
- Thread.currentThread().sleep( 100 );
+ Thread.sleep( 100 );
}
catch( Throwable e )
{
@@ -291,7 +289,7 @@
{
try
{
- Thread.currentThread().sleep( 100 );
+ Thread.sleep( 100 );
}
catch( Throwable e )
{
@@ -321,7 +319,7 @@
{
try
{
- Thread.currentThread().sleep( 100 );
+ Thread.sleep( 100 );
}
catch( Throwable e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org