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:50:05 UTC
cvs commit: avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools MerlinBean.java
cziegeler 2004/03/17 02:50:05
Modified: meta/api/src/java/org/apache/avalon/meta/info
PermissionDescriptor.java SecurityDescriptor.java
repository/util/src/java/org/apache/avalon/repository/util
LoaderUtils.java
repository/impl/src/java/org/apache/avalon/repository/impl
DefaultRepositoryCriteria.java
DefaultRepository.java DefaultFactory.java
repository/spi/src/java/org/apache/avalon/repository/provider
InitialContextFactory.java
meta/tools/src/java/org/apache/avalon/meta/info/builder/tags
ContextTag.java SchemaTag.java TypeTag.java
SecurityTag.java
repository/main/src/java/org/apache/avalon/repository/main
AbstractBuilder.java DefaultBuilder.java
DefaultInitialContext.java
DefaultInitialContextFactory.java
repository/cli/src/java/org/apache/avalon/repository/cli
RepositoryVerifier.java Main.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultKernelContext.java DefaultKernel.java
DefaultFactory.java DefaultCriteria.java
logging/logkit/impl/src/java/org/apache/avalon/logging/logkit
DefaultLogTargetManager.java
DefaultLogTargetFactoryManager.java
DefaultLogTargetFactoryBuilder.java
DefaultLoggingFactory.java
DefaultLoggingManager.java StandardFormatter.java
merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test
MerlinCLITestCase.java
util/defaults/src/java/org/apache/avalon/util/defaults
DefaultsBuilder.java
repository/spi/src/java/org/apache/avalon/repository/meta
FactoryDescriptor.java
logging/log4j/src/java/org/apache/avalon/logging/log4j
Log4JLoggingFactory.java LoggingManagerImpl.java
meta/api/src/test/org/apache/avalon/meta/info/test
SecurityDescriptorTestCase.java
logging/impl/src/java/org/apache/avalon/logging/impl
ConfigurationParameter.java LoggerParameter.java
DefaultLoggingCriteria.java
logging/logkit/api/src/java/org/apache/avalon/logging/logkit
UnknownLogTargetException.java
LogTargetFactory.java MissingIdException.java
LogTargetFactoryBuilder.java
util/criteria/src/java/org/apache/avalon/util/criteria
PackedParameter.java Criteria.java
merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test
MerlinTestCaseTest.java
repository/api/src/java/org/apache/avalon/repository
BlockURLConnection.java AbstractURLConnection.java
Artifact.java ArtifactURLConnection.java
merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet
MerlinServlet.java
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
Log:
Remove unused imports
Revision Changes Path
1.5 +1 -3 avalon/meta/api/src/java/org/apache/avalon/meta/info/PermissionDescriptor.java
Index: PermissionDescriptor.java
===================================================================
RCS file: /home/cvs/avalon/meta/api/src/java/org/apache/avalon/meta/info/PermissionDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PermissionDescriptor.java 12 Mar 2004 08:01:59 -0000 1.4
+++ PermissionDescriptor.java 17 Mar 2004 10:50:03 -0000 1.5
@@ -18,8 +18,6 @@
package org.apache.avalon.meta.info;
import java.io.Serializable;
-import java.util.StringTokenizer;
-import java.util.ArrayList;
/**
* A descriptor that describes a value that must be placed
1.3 +1 -3 avalon/meta/api/src/java/org/apache/avalon/meta/info/SecurityDescriptor.java
Index: SecurityDescriptor.java
===================================================================
RCS file: /home/cvs/avalon/meta/api/src/java/org/apache/avalon/meta/info/SecurityDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityDescriptor.java 12 Mar 2004 08:01:59 -0000 1.2
+++ SecurityDescriptor.java 17 Mar 2004 10:50:03 -0000 1.3
@@ -19,8 +19,6 @@
import java.util.Properties;
-import org.apache.avalon.framework.Version;
-
/**
* This class is used to provide security information to assembler
* and administrator about the component type.
1.7 +1 -12 avalon/repository/util/src/java/org/apache/avalon/repository/util/LoaderUtils.java
Index: LoaderUtils.java
===================================================================
RCS file: /home/cvs/avalon/repository/util/src/java/org/apache/avalon/repository/util/LoaderUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoaderUtils.java 4 Mar 2004 03:26:42 -0000 1.6
+++ LoaderUtils.java 17 Mar 2004 10:50:03 -0000 1.7
@@ -19,25 +19,14 @@
import java.io.File ;
-import java.io.FileInputStream ;
import java.io.FileOutputStream ;
import java.io.InputStream ;
import java.io.IOException ;
import java.io.OutputStream ;
-import java.util.ArrayList ;
-import java.text.ParseException ;
-import java.util.Properties ;
-
import java.net.HttpURLConnection ;
-import java.net.MalformedURLException ;
import java.net.URL ;
-import java.net.URLClassLoader ;
import java.net.URLConnection ;
-
-import javax.naming.NamingEnumeration ;
-import javax.naming.NamingException ;
-import javax.naming.directory.Attributes ;
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.RepositoryException;
1.10 +1 -9 avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryCriteria.java
Index: DefaultRepositoryCriteria.java
===================================================================
RCS file: /home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryCriteria.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultRepositoryCriteria.java 4 Mar 2004 03:26:41 -0000 1.9
+++ DefaultRepositoryCriteria.java 17 Mar 2004 10:50:03 -0000 1.10
@@ -19,12 +19,7 @@
import java.io.IOException;
import java.io.File;
-import java.io.InputStream;
import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Map;
-import java.net.URL;
-import java.net.MalformedURLException;
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.RepositoryException;
@@ -35,9 +30,6 @@
import org.apache.avalon.util.criteria.Parameter;
import org.apache.avalon.util.criteria.PackedParameter;
import org.apache.avalon.util.defaults.Defaults;
-import org.apache.avalon.util.defaults.DefaultsFinder;
-import org.apache.avalon.util.defaults.SimpleDefaultsFinder;
-import org.apache.avalon.util.defaults.SystemDefaultsFinder;
import org.apache.avalon.util.defaults.DefaultsBuilder;
1.10 +1 -10 avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepository.java
Index: DefaultRepository.java
===================================================================
RCS file: /home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultRepository.java 4 Mar 2004 03:26:41 -0000 1.9
+++ DefaultRepository.java 17 Mar 2004 10:50:03 -0000 1.10
@@ -19,20 +19,11 @@
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.List;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-import java.net.JarURLConnection;
import java.net.URL;
-import java.net.Authenticator;
import java.net.URLClassLoader;
-import java.net.MalformedURLException;
import javax.naming.directory.Attributes;
1.10 +1 -16 avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file: /home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultFactory.java 8 Mar 2004 11:26:10 -0000 1.9
+++ DefaultFactory.java 17 Mar 2004 10:50:03 -0000 1.10
@@ -19,29 +19,14 @@
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Map;
-import java.util.ArrayList;
-import java.util.Properties;
-import java.net.Authenticator;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.avalon.util.defaults.Defaults;
-import org.apache.avalon.util.defaults.DefaultsFinder;
-import org.apache.avalon.util.defaults.SimpleDefaultsFinder;
-import org.apache.avalon.util.defaults.SystemDefaultsFinder;
import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.RepositoryRuntimeException;
import org.apache.avalon.repository.provider.RepositoryCriteria;
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.util.RepositoryUtils;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.9 +1 -2 avalon/repository/spi/src/java/org/apache/avalon/repository/provider/InitialContextFactory.java
Index: InitialContextFactory.java
===================================================================
RCS file: /home/cvs/avalon/repository/spi/src/java/org/apache/avalon/repository/provider/InitialContextFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InitialContextFactory.java 4 Mar 2004 07:10:07 -0000 1.8
+++ InitialContextFactory.java 17 Mar 2004 10:50:03 -0000 1.9
@@ -19,7 +19,6 @@
import java.io.File;
-import java.io.IOException;
import org.apache.avalon.repository.Artifact;
1.4 +1 -2 avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java
Index: ContextTag.java
===================================================================
RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextTag.java 11 Mar 2004 13:44:55 -0000 1.3
+++ ContextTag.java 17 Mar 2004 10:50:03 -0000 1.4
@@ -27,7 +27,6 @@
import com.thoughtworks.qdox.model.JavaMethod;
import org.apache.avalon.meta.info.ContextDescriptor;
import org.apache.avalon.meta.info.EntryDescriptor;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
/**
* A doclet tag handler for the 'extension' tag.
1.5 +1 -5 avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/SchemaTag.java
Index: SchemaTag.java
===================================================================
RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/SchemaTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SchemaTag.java 11 Mar 2004 13:51:42 -0000 1.4
+++ SchemaTag.java 17 Mar 2004 10:50:03 -0000 1.5
@@ -22,10 +22,6 @@
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaMethod;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* A doclet tag handler supporting 'logger' tags.
*
1.7 +1 -2 avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java
Index: TypeTag.java
===================================================================
RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TypeTag.java 24 Feb 2004 22:32:46 -0000 1.6
+++ TypeTag.java 17 Mar 2004 10:50:03 -0000 1.7
@@ -28,7 +28,6 @@
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.SecurityDescriptor;
-import org.apache.avalon.meta.info.PermissionDescriptor;
import org.apache.avalon.meta.info.Type;
import com.thoughtworks.qdox.model.DocletTag;
1.3 +1 -4 avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/SecurityTag.java
Index: SecurityTag.java
===================================================================
RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/SecurityTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityTag.java 26 Feb 2004 00:02:18 -0000 1.2
+++ SecurityTag.java 17 Mar 2004 10:50:03 -0000 1.3
@@ -17,14 +17,11 @@
package org.apache.avalon.meta.info.builder.tags;
-import java.util.Properties;
import java.util.ArrayList;
import java.util.StringTokenizer;
-import org.apache.avalon.framework.Version;
import org.apache.avalon.meta.info.SecurityDescriptor;
import org.apache.avalon.meta.info.PermissionDescriptor;
-import org.apache.avalon.meta.info.Service;
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
1.9 +1 -11 avalon/repository/main/src/java/org/apache/avalon/repository/main/AbstractBuilder.java
Index: AbstractBuilder.java
===================================================================
RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/AbstractBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractBuilder.java 24 Feb 2004 22:18:23 -0000 1.8
+++ AbstractBuilder.java 17 Mar 2004 10:50:03 -0000 1.9
@@ -17,19 +17,9 @@
package org.apache.avalon.repository.main ;
-import java.io.File;
-import java.text.ParseException ;
-import java.util.Map ;
-
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException ;
-import java.lang.reflect.Method ;
-
-import javax.naming.directory.Attributes;
-import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.RepositoryException;
-import org.apache.avalon.repository.RepositoryRuntimeException;
import org.apache.avalon.repository.provider.Factory;
import org.apache.avalon.repository.provider.InitialContext;
1.16 +1 -13 avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java
Index: DefaultBuilder.java
===================================================================
RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultBuilder.java 24 Feb 2004 22:39:30 -0000 1.15
+++ DefaultBuilder.java 17 Mar 2004 10:50:03 -0000 1.16
@@ -21,21 +21,11 @@
import java.io.InputStream;
import java.io.FileInputStream;
import java.io.IOException;
-import java.net.URL;
-import java.text.ParseException;
-import java.util.Map;
import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.ArrayList;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import javax.naming.directory.Attributes;
import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.ArtifactHandler;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.RepositoryRuntimeException;
@@ -43,8 +33,6 @@
import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.exception.ExceptionHelper;
/**
1.27 +1 -21 avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java
Index: DefaultInitialContext.java
===================================================================
RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultInitialContext.java 4 Mar 2004 07:10:07 -0000 1.26
+++ DefaultInitialContext.java 17 Mar 2004 10:50:03 -0000 1.27
@@ -21,49 +21,29 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.lang.reflect.Constructor;
-import java.lang.NoSuchMethodException;
import java.net.Authenticator;
import java.net.URL;
-import java.net.URLConnection;
import java.net.URLClassLoader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
import java.net.JarURLConnection;
-import java.text.ParseException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Enumeration;
-import java.util.Map;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.jar.Manifest;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
import javax.naming.directory.Attributes;
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.RepositoryException;
-import org.apache.avalon.repository.RepositoryRuntimeException;
import org.apache.avalon.repository.meta.FactoryDescriptor;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.provider.FactoryNotFoundException;
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.RepositoryCriteria;
import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.util.LoaderUtils;
import org.apache.avalon.repository.util.RepositoryUtils;
-
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.env.EnvAccessException;
-import org.apache.avalon.util.exception.ExceptionHelper;
/**
1.11 +1 -33 avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContextFactory.java
Index: DefaultInitialContextFactory.java
===================================================================
RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContextFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultInitialContextFactory.java 4 Mar 2004 07:10:07 -0000 1.10
+++ DefaultInitialContextFactory.java 17 Mar 2004 10:50:03 -0000 1.11
@@ -21,47 +21,15 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.lang.reflect.Constructor;
-import java.lang.NoSuchMethodException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLClassLoader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.JarURLConnection;
import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Hashtable;
-import java.util.Map;
import java.util.Properties;
-import java.text.ParseException;
import java.util.StringTokenizer;
-import java.util.jar.Manifest;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.Attributes;
import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.RepositoryRuntimeException;
-import org.apache.avalon.repository.data.FactoryDirective;
-import org.apache.avalon.repository.meta.FactoryDescriptor;
-import org.apache.avalon.repository.provider.Factory;
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.InitialContextFactory;
-import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.util.RepositoryUtils;
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.env.EnvAccessException;
-import org.apache.avalon.util.exception.ExceptionHelper;
import org.apache.avalon.util.defaults.DefaultsBuilder;
import org.apache.avalon.util.defaults.Defaults;
1.5 +1 -34 avalon/repository/cli/src/java/org/apache/avalon/repository/cli/RepositoryVerifier.java
Index: RepositoryVerifier.java
===================================================================
RCS file: /home/cvs/avalon/repository/cli/src/java/org/apache/avalon/repository/cli/RepositoryVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepositoryVerifier.java 8 Mar 2004 11:26:10 -0000 1.4
+++ RepositoryVerifier.java 17 Mar 2004 10:50:04 -0000 1.5
@@ -19,44 +19,11 @@
import java.io.File;
import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import javax.naming.directory.Attributes;
-
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.RepositoryException;
-import org.apache.avalon.repository.main.DefaultInitialContext;
-import org.apache.avalon.repository.main.DefaultBuilder;
-import org.apache.avalon.repository.meta.ArtifactDescriptor;
-import org.apache.avalon.repository.util.RepositoryUtils;
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.exception.ExceptionHelper;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
-
-import org.apache.commons.cli.BasicParser;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
/**
1.8 +1 -9 avalon/repository/cli/src/java/org/apache/avalon/repository/cli/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/avalon/repository/cli/src/java/org/apache/avalon/repository/cli/Main.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Main.java 8 Mar 2004 11:26:10 -0000 1.7
+++ Main.java 17 Mar 2004 10:50:04 -0000 1.8
@@ -20,24 +20,16 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.Enumeration;
import java.util.Locale;
import java.util.ArrayList;
import java.util.StringTokenizer;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import javax.naming.directory.Attributes;
import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContextFactory;
import org.apache.avalon.repository.main.DefaultBuilder;
1.6 +1 -4 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultKernelContext.java 24 Feb 2004 22:18:22 -0000 1.5
+++ DefaultKernelContext.java 17 Mar 2004 10:50:04 -0000 1.6
@@ -17,9 +17,6 @@
package org.apache.avalon.merlin.impl;
-import java.net.URL;
-import java.io.File;
-
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.model.ContainmentModel;
1.12 +1 -11 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultKernel.java 10 Feb 2004 16:31:16 -0000 1.11
+++ DefaultKernel.java 17 Mar 2004 10:50:04 -0000 1.12
@@ -17,7 +17,6 @@
package org.apache.avalon.merlin.impl;
-import java.net.URL;
import java.util.LinkedList;
import java.util.Iterator;
@@ -25,23 +24,14 @@
import org.apache.avalon.merlin.KernelContext;
import org.apache.avalon.merlin.KernelError;
import org.apache.avalon.merlin.KernelException;
-import org.apache.avalon.merlin.KernelRuntimeException;
import org.apache.avalon.merlin.event.KernelEventListener;
import org.apache.avalon.merlin.event.KernelStateEvent;
-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.ComponentModel;
-import org.apache.avalon.composition.provider.SystemContext;
-import org.apache.avalon.composition.util.StringHelper;
-
-import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.Logger;
-
-import org.apache.avalon.util.exception.ExceptionHelper;
/**
* Implementation of the default Merlin Kernel.
1.40 +0 -26 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- DefaultFactory.java 8 Mar 2004 11:28:37 -0000 1.39
+++ DefaultFactory.java 17 Mar 2004 10:50:04 -0000 1.40
@@ -20,59 +20,33 @@
import java.io.File;
import java.io.InputStream;
-import java.io.IOException;
import java.net.URL;
import java.util.Hashtable;
import java.util.Map;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Locale;
-import java.security.cert.CertificateException;
-import org.apache.avalon.composition.data.CertsDirective;
import org.apache.avalon.composition.data.ContainmentProfile;
-import org.apache.avalon.composition.data.GrantDirective;
-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.X509Directive;
import org.apache.avalon.composition.data.SecurityProfile;
import org.apache.avalon.composition.data.builder.XMLTargetsCreator;
import org.apache.avalon.composition.data.builder.XMLComponentProfileCreator;
import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
import org.apache.avalon.composition.data.builder.XMLSecurityProfileBuilder;
-import org.apache.avalon.composition.provider.ContainmentContext;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.ModelRepository;
-import org.apache.avalon.composition.model.impl.DefaultSecurityModel;
-import org.apache.avalon.composition.model.impl.DefaultSystemContext;
-import org.apache.avalon.composition.model.impl.DefaultContainmentContext;
-import org.apache.avalon.composition.model.impl.DefaultContainmentModel;
-import org.apache.avalon.composition.model.impl.DefaultClassLoaderModel;
-import org.apache.avalon.composition.model.impl.DefaultClassLoaderContext;
-import org.apache.avalon.composition.model.impl.DefaultModelRepository;
import org.apache.avalon.composition.model.impl.DefaultSystemContextFactory;
-import org.apache.avalon.composition.provider.SecurityModel;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.SystemContextFactory;
-import org.apache.avalon.composition.provider.ClassLoaderContext;
import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-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.framework.activity.Disposable;
-import org.apache.avalon.logging.data.CategoriesDirective;
import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.logging.provider.LoggingCriteria;
1.30 +1 -9 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
Index: DefaultCriteria.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DefaultCriteria.java 1 Mar 2004 16:57:27 -0000 1.29
+++ DefaultCriteria.java 17 Mar 2004 10:50:04 -0000 1.30
@@ -19,14 +19,11 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
import java.util.ArrayList;
-import java.util.Map;
import org.apache.avalon.merlin.KernelCriteria;
import org.apache.avalon.merlin.KernelRuntimeException;
@@ -37,14 +34,9 @@
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.util.defaults.Defaults;
-import org.apache.avalon.util.defaults.DefaultsFinder;
import org.apache.avalon.util.defaults.DefaultsBuilder;
-import org.apache.avalon.util.defaults.SimpleDefaultsFinder;
-import org.apache.avalon.util.defaults.SystemDefaultsFinder;
import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.env.EnvAccessException;
import org.apache.avalon.util.exception.ExceptionHelper;
-import org.apache.avalon.util.criteria.CriteriaException;
import org.apache.avalon.util.criteria.Criteria;
import org.apache.avalon.util.criteria.Parameter;
import org.apache.avalon.util.criteria.PackedParameter;
1.3 +0 -16 avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetManager.java
Index: DefaultLogTargetManager.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLogTargetManager.java 8 Mar 2004 11:32:01 -0000 1.2
+++ DefaultLogTargetManager.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,28 +17,12 @@
package org.apache.avalon.logging.logkit;
-import java.io.File;
-import java.io.IOException;
import java.util.Map;
-import java.util.HashMap;
-
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.logging.data.CategoryDirective;
-import org.apache.avalon.logging.data.CategoriesDirective;
-
-import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.provider.LoggingException;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
-import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
-import org.apache.log.Priority;
-import org.apache.log.output.io.FileTarget;
-import org.apache.log.output.io.StreamTarget;
/**
* A <code>LoggerManager</code> interface declares operation supporting
1.3 +0 -19 avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryManager.java
Index: DefaultLogTargetFactoryManager.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLogTargetFactoryManager.java 8 Mar 2004 11:32:01 -0000 1.2
+++ DefaultLogTargetFactoryManager.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,29 +17,10 @@
package org.apache.avalon.logging.logkit;
-import java.io.File;
-import java.io.IOException;
import java.util.Map;
-import java.util.HashMap;
-
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.configuration.Configuration;
-
-import org.apache.avalon.logging.data.CategoryDirective;
-import org.apache.avalon.logging.data.CategoriesDirective;
-
-import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.provider.LoggingException;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
-
-import org.apache.log.Hierarchy;
-import org.apache.log.LogTarget;
-import org.apache.log.Priority;
-import org.apache.log.output.io.FileTarget;
-import org.apache.log.output.io.StreamTarget;
/**
* A <code>LoggerManager</code> interface declares operation supporting
1.4 +0 -18 avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryBuilder.java
Index: DefaultLogTargetFactoryBuilder.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLogTargetFactoryBuilder.java 8 Mar 2004 11:32:01 -0000 1.3
+++ DefaultLogTargetFactoryBuilder.java 17 Mar 2004 10:50:04 -0000 1.4
@@ -18,35 +18,17 @@
package org.apache.avalon.logging.logkit;
import java.io.File;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException ;
-import java.lang.reflect.Method ;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.logging.provider.LoggingCriteria;
import org.apache.avalon.logging.provider.LoggingException;
-import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
-import org.apache.avalon.logging.logkit.factory.FileTargetFactory;
-import org.apache.avalon.logging.logkit.factory.StreamTargetFactory;
-import org.apache.avalon.logging.logkit.factory.MulticastTargetFactory;
-import org.apache.avalon.logging.logkit.factory.PluginTargetFactory;
import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
-
-import org.apache.log.LogTarget;
-import org.apache.log.output.io.StreamTarget;
-import org.apache.log.format.Formatter;
/**
* The DefaultLoggingFactory provides support for the establishment of a
1.8 +0 -8 avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingFactory.java
Index: DefaultLoggingFactory.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultLoggingFactory.java 8 Mar 2004 11:32:01 -0000 1.7
+++ DefaultLoggingFactory.java 17 Mar 2004 10:50:04 -0000 1.8
@@ -24,14 +24,9 @@
import java.util.HashMap;
import java.util.ArrayList;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException ;
-import java.lang.reflect.Method ;
-
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.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.logging.impl.ConsoleLogger;
@@ -51,7 +46,6 @@
import org.apache.avalon.logging.logkit.factory.PluginTargetFactory;
import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
@@ -59,8 +53,6 @@
import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.log.LogTarget;
-import org.apache.log.output.io.StreamTarget;
-import org.apache.log.format.Formatter;
/**
* The DefaultLoggingFactory provides support for the establishment of a
1.3 +0 -7 avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingManager.java
Index: DefaultLoggingManager.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoggingManager.java 8 Mar 2004 11:32:01 -0000 1.2
+++ DefaultLoggingManager.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,13 +17,7 @@
package org.apache.avalon.logging.logkit;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.logging.data.CategoriesDirective;
@@ -38,7 +32,6 @@
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.Priority;
-import org.apache.log.output.io.FileTarget;
import org.apache.log.output.io.StreamTarget;
import org.apache.log.format.Formatter;
1.3 +1 -2 avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/StandardFormatter.java
Index: StandardFormatter.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/StandardFormatter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardFormatter.java 21 Feb 2004 13:27:03 -0000 1.2
+++ StandardFormatter.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -18,7 +18,6 @@
package org.apache.avalon.logging.logkit;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.ExceptionUtil;
import org.apache.log.LogEvent;
import org.apache.log.format.ExtendedPatternFormatter;
import org.apache.log.format.PatternFormatter;
1.5 +1 -8 avalon/merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java
Index: MerlinCLITestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MerlinCLITestCase.java 24 Feb 2004 22:18:22 -0000 1.4
+++ MerlinCLITestCase.java 17 Mar 2004 10:50:04 -0000 1.5
@@ -18,13 +18,6 @@
package org.apache.avalon.merlin.cli.test;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import junit.framework.TestCase;
1.6 +1 -8 avalon/util/defaults/src/java/org/apache/avalon/util/defaults/DefaultsBuilder.java
Index: DefaultsBuilder.java
===================================================================
RCS file: /home/cvs/avalon/util/defaults/src/java/org/apache/avalon/util/defaults/DefaultsBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultsBuilder.java 4 Mar 2004 03:28:55 -0000 1.5
+++ DefaultsBuilder.java 17 Mar 2004 10:50:04 -0000 1.6
@@ -21,16 +21,9 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.util.Map;
import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.env.EnvAccessException;
/**
1.6 +1 -3 avalon/repository/spi/src/java/org/apache/avalon/repository/meta/FactoryDescriptor.java
Index: FactoryDescriptor.java
===================================================================
RCS file: /home/cvs/avalon/repository/spi/src/java/org/apache/avalon/repository/meta/FactoryDescriptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FactoryDescriptor.java 27 Feb 2004 22:39:37 -0000 1.5
+++ FactoryDescriptor.java 17 Mar 2004 10:50:04 -0000 1.6
@@ -17,8 +17,6 @@
package org.apache.avalon.repository.meta;
-import java.io.Serializable;
-import java.util.NoSuchElementException;
import javax.naming.directory.Attributes;
import javax.naming.directory.Attribute;
import javax.naming.NamingException;
1.10 +1 -9 avalon/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java
Index: Log4JLoggingFactory.java
===================================================================
RCS file: /home/cvs/avalon/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Log4JLoggingFactory.java 8 Mar 2004 11:32:01 -0000 1.9
+++ Log4JLoggingFactory.java 17 Mar 2004 10:50:04 -0000 1.10
@@ -20,15 +20,10 @@
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationUtil;
-
import org.apache.avalon.logging.impl.DefaultLoggingCriteria;
import org.apache.avalon.logging.provider.LoggingCriteria;
import org.apache.avalon.logging.provider.LoggingFactory;
@@ -36,15 +31,12 @@
import org.apache.avalon.logging.provider.LoggingException;
import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.xml.DOMConfigurator;
-
-import org.w3c.dom.Element;
/**
* A Log4J factory.
1.2 +0 -2 avalon/logging/log4j/src/java/org/apache/avalon/logging/log4j/LoggingManagerImpl.java
Index: LoggingManagerImpl.java
===================================================================
RCS file: /home/cvs/avalon/logging/log4j/src/java/org/apache/avalon/logging/log4j/LoggingManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggingManagerImpl.java 24 Feb 2004 21:37:37 -0000 1.1
+++ LoggingManagerImpl.java 17 Mar 2004 10:50:04 -0000 1.2
@@ -18,11 +18,9 @@
package org.apache.avalon.logging.log4j;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.logging.data.CategoriesDirective;
import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.provider.LoggingException;
/**
* A <code>LoggerManager</code> that supports the management of a logging hierarchy.
1.2 +0 -4 avalon/meta/api/src/test/org/apache/avalon/meta/info/test/SecurityDescriptorTestCase.java
Index: SecurityDescriptorTestCase.java
===================================================================
RCS file: /home/cvs/avalon/meta/api/src/test/org/apache/avalon/meta/info/test/SecurityDescriptorTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityDescriptorTestCase.java 24 Feb 2004 22:44:37 -0000 1.1
+++ SecurityDescriptorTestCase.java 17 Mar 2004 10:50:04 -0000 1.2
@@ -17,10 +17,6 @@
package org.apache.avalon.meta.info.test;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
import org.apache.avalon.meta.info.PermissionDescriptor;
import org.apache.avalon.meta.info.SecurityDescriptor;
import org.apache.avalon.meta.info.Descriptor;
1.4 +1 -5 avalon/logging/impl/src/java/org/apache/avalon/logging/impl/ConfigurationParameter.java
Index: ConfigurationParameter.java
===================================================================
RCS file: /home/cvs/avalon/logging/impl/src/java/org/apache/avalon/logging/impl/ConfigurationParameter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurationParameter.java 10 Mar 2004 08:37:54 -0000 1.3
+++ ConfigurationParameter.java 17 Mar 2004 10:50:04 -0000 1.4
@@ -19,10 +19,6 @@
import java.io.File;
import java.net.URL;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
import org.apache.avalon.util.criteria.Parameter;
import org.apache.avalon.util.criteria.CriteriaException;
1.3 +1 -7 avalon/logging/impl/src/java/org/apache/avalon/logging/impl/LoggerParameter.java
Index: LoggerParameter.java
===================================================================
RCS file: /home/cvs/avalon/logging/impl/src/java/org/apache/avalon/logging/impl/LoggerParameter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggerParameter.java 8 Mar 2004 11:32:00 -0000 1.2
+++ LoggerParameter.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,12 +17,6 @@
package org.apache.avalon.logging.impl;
-import java.io.File;
-import java.net.URL;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.util.criteria.Parameter;
1.3 +1 -5 avalon/logging/impl/src/java/org/apache/avalon/logging/impl/DefaultLoggingCriteria.java
Index: DefaultLoggingCriteria.java
===================================================================
RCS file: /home/cvs/avalon/logging/impl/src/java/org/apache/avalon/logging/impl/DefaultLoggingCriteria.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoggingCriteria.java 8 Mar 2004 11:32:00 -0000 1.2
+++ DefaultLoggingCriteria.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -25,14 +25,10 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.logging.provider.LoggingCriteria;
-import org.apache.avalon.logging.provider.LoggingException;
import org.apache.avalon.logging.provider.LoggingRuntimeException;
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.ArtifactHandler;
import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.util.criteria.CriteriaException;
import org.apache.avalon.util.criteria.Criteria;
import org.apache.avalon.util.criteria.Parameter;
1.3 +1 -3 avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/UnknownLogTargetException.java
Index: UnknownLogTargetException.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/UnknownLogTargetException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnknownLogTargetException.java 24 Feb 2004 21:55:39 -0000 1.2
+++ UnknownLogTargetException.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,8 +17,6 @@
package org.apache.avalon.logging.logkit;
-import org.apache.avalon.logging.provider.LoggingException;
-
/**
* Exception to indicate that a log target reference is unknown.
*
1.3 +1 -2 avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/LogTargetFactory.java
Index: LogTargetFactory.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/LogTargetFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogTargetFactory.java 24 Feb 2004 21:55:39 -0000 1.2
+++ LogTargetFactory.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -18,7 +18,6 @@
package org.apache.avalon.logging.logkit;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.log.LogTarget;
/**
1.3 +1 -3 avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/MissingIdException.java
Index: MissingIdException.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/MissingIdException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MissingIdException.java 24 Feb 2004 21:55:39 -0000 1.2
+++ MissingIdException.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,8 +17,6 @@
package org.apache.avalon.logging.logkit;
-import org.apache.avalon.logging.provider.LoggingException;
-
/**
* Exception to indicate that a log target configuration does not contain a target id.
*
1.3 +1 -8 avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/LogTargetFactoryBuilder.java
Index: LogTargetFactoryBuilder.java
===================================================================
RCS file: /home/cvs/avalon/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/LogTargetFactoryBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogTargetFactoryBuilder.java 24 Feb 2004 21:55:39 -0000 1.2
+++ LogTargetFactoryBuilder.java 17 Mar 2004 10:50:04 -0000 1.3
@@ -17,14 +17,7 @@
package org.apache.avalon.logging.logkit;
-import java.io.File;
-
-import org.apache.avalon.framework.logger.Logger;
-
import org.apache.avalon.logging.provider.LoggingException;
-
-import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
/**
* A LogTargetFactoryBuilder provides support for the establishment of
1.5 +1 -3 avalon/util/criteria/src/java/org/apache/avalon/util/criteria/PackedParameter.java
Index: PackedParameter.java
===================================================================
RCS file: /home/cvs/avalon/util/criteria/src/java/org/apache/avalon/util/criteria/PackedParameter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PackedParameter.java 24 Feb 2004 22:18:24 -0000 1.4
+++ PackedParameter.java 17 Mar 2004 10:50:05 -0000 1.5
@@ -17,8 +17,6 @@
package org.apache.avalon.util.criteria;
-import java.lang.reflect.Constructor;
-
import java.util.ArrayList;
import java.util.StringTokenizer;
1.5 +1 -9 avalon/util/criteria/src/java/org/apache/avalon/util/criteria/Criteria.java
Index: Criteria.java
===================================================================
RCS file: /home/cvs/avalon/util/criteria/src/java/org/apache/avalon/util/criteria/Criteria.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Criteria.java 24 Feb 2004 22:18:24 -0000 1.4
+++ Criteria.java 17 Mar 2004 10:50:05 -0000 1.5
@@ -17,15 +17,7 @@
package org.apache.avalon.util.criteria;
-import java.io.IOException;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Properties;
import java.util.HashMap;
-import java.util.Map;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.lang.reflect.Constructor;
/**
* A abstract utility class that can be used to simplify the
1.5 +1 -23 avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java
Index: MerlinTestCaseTest.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MerlinTestCaseTest.java 24 Feb 2004 22:18:23 -0000 1.4
+++ MerlinTestCaseTest.java 17 Mar 2004 10:50:05 -0000 1.5
@@ -17,28 +17,6 @@
package org.apache.avalon.merlin.unit.test;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.TestCase;
-
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.RepositoryException;
-import org.apache.avalon.repository.main.DefaultInitialContext;
-import org.apache.avalon.repository.main.DefaultBuilder;
-
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.exception.ExceptionHelper;
-
import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
/**
1.2 +0 -4 avalon/repository/api/src/java/org/apache/avalon/repository/BlockURLConnection.java
Index: BlockURLConnection.java
===================================================================
RCS file: /home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/BlockURLConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockURLConnection.java 24 Jan 2004 23:20:04 -0000 1.1
+++ BlockURLConnection.java 17 Mar 2004 10:50:05 -0000 1.2
@@ -19,10 +19,6 @@
import java.io.IOException;
import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.net.MalformedURLException;
-import java.util.StringTokenizer;
/**
* Repository URL protocol handler.
1.3 +0 -1 avalon/repository/api/src/java/org/apache/avalon/repository/AbstractURLConnection.java
Index: AbstractURLConnection.java
===================================================================
RCS file: /home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/AbstractURLConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractURLConnection.java 15 Feb 2004 01:24:50 -0000 1.2
+++ AbstractURLConnection.java 17 Mar 2004 10:50:05 -0000 1.3
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
-import java.net.URLStreamHandler;
import java.net.MalformedURLException;
import java.util.StringTokenizer;
1.8 +1 -4 avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file: /home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Artifact.java 24 Feb 2004 22:18:23 -0000 1.7
+++ Artifact.java 17 Mar 2004 10:50:05 -0000 1.8
@@ -20,10 +20,7 @@
import java.io.Serializable;
import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Properties;
import java.net.URL;
-import java.net.MalformedURLException;
/**
* Defintion of a artifact that maintains a relative url
1.2 +0 -4 avalon/repository/api/src/java/org/apache/avalon/repository/ArtifactURLConnection.java
Index: ArtifactURLConnection.java
===================================================================
RCS file: /home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/ArtifactURLConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArtifactURLConnection.java 24 Jan 2004 23:20:04 -0000 1.1
+++ ArtifactURLConnection.java 17 Mar 2004 10:50:05 -0000 1.2
@@ -19,10 +19,6 @@
import java.io.IOException;
import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.net.MalformedURLException;
-import java.util.StringTokenizer;
/**
* Repository URL protocol handler.
1.10 +0 -6 avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java
Index: MerlinServlet.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MerlinServlet.java 24 Feb 2004 22:18:22 -0000 1.9
+++ MerlinServlet.java 17 Mar 2004 10:50:05 -0000 1.10
@@ -19,9 +19,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.Map;
-import java.util.Hashtable;
-import java.net.URL;
import java.io.PrintWriter;
import javax.servlet.ServletException;
@@ -29,8 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.framework.logger.Logger;
-
import org.apache.avalon.merlin.Kernel;
import org.apache.avalon.merlin.KernelCriteria;
@@ -39,7 +34,6 @@
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.InitialContextFactory;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContextFactory;
import org.apache.avalon.repository.main.DefaultBuilder;
1.27 +1 -7 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AbstractMerlinTestCase.java 24 Feb 2004 22:18:22 -0000 1.26
+++ AbstractMerlinTestCase.java 17 Mar 2004 10:50:05 -0000 1.27
@@ -18,12 +18,7 @@
package org.apache.avalon.merlin.unit;
import java.io.File;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.util.Map;
-import java.util.Properties;
-import java.util.Enumeration;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
@@ -34,7 +29,6 @@
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.InitialContextFactory;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContextFactory;
import org.apache.avalon.repository.main.DefaultBuilder;
1.17 +1 -9 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MerlinBean.java 24 Feb 2004 22:18:22 -0000 1.16
+++ MerlinBean.java 17 Mar 2004 10:50:05 -0000 1.17
@@ -18,14 +18,7 @@
package org.apache.avalon.merlin.tools;
import java.io.File;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.util.Map;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import java.util.StringTokenizer;
import java.util.ArrayList;
@@ -34,7 +27,6 @@
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.InitialContextFactory;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContextFactory;
import org.apache.avalon.repository.main.DefaultBuilder;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org