donaldp 2002/10/02 04:25:57
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockResourceProvider.java
src/java/org/apache/avalon/phoenix/components/classloader
DefaultClassLoaderManager.java SarPolicy.java
SarPolicyResolver.java SarPolicyVerifier.java
src/java/org/apache/avalon/phoenix/components/configuration
FileSystemPersistentConfigurationRepository.java
src/java/org/apache/avalon/phoenix/components/installer
DefaultInstaller.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java DefaultKernel.java
SarEntry.java
src/java/org/apache/avalon/phoenix/components/logger
DefaultLogManager.java
src/java/org/apache/avalon/phoenix/components/manager
ExtendedMX4JSystemManager.java
HostedSystemManager.java
src/java/org/apache/avalon/phoenix/components/util
ComponentInfoConverter.java ConfigurationUtil.java
ResourceUtil.java
src/java/org/apache/avalon/phoenix/interfaces
ApplicationContext.java Kernel.java
src/java/org/apache/avalon/phoenix/launcher
FreeNEasyPolicy.java
src/test/org/apache/avalon/phoenix/components/application/test
MockApplicationContext.java
src/test/org/apache/avalon/phoenix/test
AbstractContainerTestCase.java
src/test/org/apache/avalon/phoenix/test/data Component1.java
Component3.java Component4.java
src/test/org/apache/avalon/phoenix/tools/metagenerate/test
IntegrationTestCase.java
Log:
Clean imports.
Revision Changes Path
1.11 +8 -8
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
Index: BlockResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BlockResourceProvider.java 1 Oct 2002 09:34:35 -0000 1.10
+++ BlockResourceProvider.java 2 Oct 2002 11:25:55 -0000 1.11
@@ -7,6 +7,13 @@
*/
package org.apache.avalon.phoenix.components.application;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.Component;
@@ -27,13 +34,6 @@
import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Collections;
-import java.lang.reflect.Array;
/**
* The accessor used to access resources for a particular
1.43 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- DefaultClassLoaderManager.java 25 Sep 2002 11:34:08 -0000 1.42
+++ DefaultClassLoaderManager.java 2 Oct 2002 11:25:55 -0000 1.43
@@ -30,11 +30,11 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.components.util.ConfigurationUtil;
-import org.apache.excalibur.policy.reader.PolicyReader;
-import org.apache.excalibur.policy.metadata.PolicyMetaData;
+import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.excalibur.policy.builder.PolicyBuilder;
+import org.apache.excalibur.policy.metadata.PolicyMetaData;
+import org.apache.excalibur.policy.reader.PolicyReader;
import org.w3c.dom.Element;
/**
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicy.java
Index: SarPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SarPolicy.java 22 Sep 2002 08:52:13 -0000 1.1
+++ SarPolicy.java 2 Oct 2002 11:25:55 -0000 1.2
@@ -11,9 +11,9 @@
import java.security.PermissionCollection;
import java.security.Permissions;
import java.util.Map;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.excalibur.policy.runtime.DefaultPolicy;
/**
1.3 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java
Index: SarPolicyResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SarPolicyResolver.java 25 Sep 2002 21:16:34 -0000 1.2
+++ SarPolicyResolver.java 2 Oct 2002 11:25:55 -0000 1.3
@@ -9,15 +9,15 @@
import java.io.File;
import java.net.URL;
+import java.security.Policy;
import java.util.HashMap;
import java.util.Map;
-import java.security.Policy;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.framework.CascadingException;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.excalibur.policy.builder.PolicyResolver;
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyVerifier.java
Index: SarPolicyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyVerifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SarPolicyVerifier.java 25 Sep 2002 11:34:08 -0000 1.1
+++ SarPolicyVerifier.java 2 Oct 2002 11:25:55 -0000 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.phoenix.components.classloader;
-import org.apache.excalibur.policy.verifier.PolicyVerifier;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.excalibur.policy.verifier.PolicyVerifier;
/**
* A simple adapter for verifier to support logging to
1.11 +0 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
Index: FileSystemPersistentConfigurationRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileSystemPersistentConfigurationRepository.java 6 Sep 2002 12:01:07 -0000
1.10
+++ FileSystemPersistentConfigurationRepository.java 2 Oct 2002 11:25:55 -0000
1.11
@@ -9,7 +9,6 @@
import java.io.File;
import java.io.IOException;
-
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.FileUtil;
@@ -31,7 +30,6 @@
import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.excalibur.configuration.merged.ConfigurationMerger;
import org.apache.excalibur.configuration.merged.ConfigurationSplitter;
-
import org.xml.sax.SAXException;
/**
1.10 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/installer/DefaultInstaller.java
Index: DefaultInstaller.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/installer/DefaultInstaller.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultInstaller.java 25 Sep 2002 12:46:00 -0000 1.9
+++ DefaultInstaller.java 2 Oct 2002 11:25:55 -0000 1.10
@@ -22,11 +22,11 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.phoenix.interfaces.Installation;
import org.apache.avalon.phoenix.interfaces.InstallationException;
import org.apache.avalon.phoenix.interfaces.Installer;
1.30 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DefaultApplicationContext.java 6 Sep 2002 09:42:35 -0000 1.29
+++ DefaultApplicationContext.java 2 Oct 2002 11:25:55 -0000 1.30
@@ -9,8 +9,8 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
1.80 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- DefaultKernel.java 6 Sep 2002 09:42:35 -0000 1.79
+++ DefaultKernel.java 2 Oct 2002 11:25:55 -0000 1.80
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.phoenix.components.kernel;
-import java.util.HashMap;
import java.io.File;
+import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.CascadingException;
1.13 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java
Index: SarEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SarEntry.java 6 Sep 2002 09:42:35 -0000 1.12
+++ SarEntry.java 2 Oct 2002 11:25:55 -0000 1.13
@@ -7,11 +7,11 @@
*/
package org.apache.avalon.phoenix.components.kernel;
+import java.io.File;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import java.io.File;
/**
* This is the structure describing each server application before it is loaded.
1.22 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java
Index: DefaultLogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultLogManager.java 28 Sep 2002 04:05:27 -0000 1.21
+++ DefaultLogManager.java 2 Oct 2002 11:25:55 -0000 1.22
@@ -12,10 +12,10 @@
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.interfaces.LogManager;
import org.apache.avalon.phoenix.metadata.SarMetaData;
1.5 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/ExtendedMX4JSystemManager.java
Index: ExtendedMX4JSystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/ExtendedMX4JSystemManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtendedMX4JSystemManager.java 7 Sep 2002 04:04:54 -0000 1.4
+++ ExtendedMX4JSystemManager.java 2 Oct 2002 11:25:55 -0000 1.5
@@ -7,16 +7,16 @@
*/
package org.apache.avalon.phoenix.components.manager;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
/**
* This component is responsible for managing phoenix instance.
1.2 +0 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java
Index: HostedSystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HostedSystemManager.java 21 Sep 2002 01:09:30 -0000 1.1
+++ HostedSystemManager.java 2 Oct 2002 11:25:55 -0000 1.2
@@ -7,12 +7,9 @@
*/
package org.apache.avalon.phoenix.components.manager;
-import java.io.File;
import java.util.ArrayList;
-import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentInfoConverter.java
Index: ComponentInfoConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentInfoConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentInfoConverter.java 30 Sep 2002 22:59:46 -0000 1.2
+++ ComponentInfoConverter.java 2 Oct 2002 11:25:56 -0000 1.3
@@ -9,10 +9,10 @@
import java.util.ArrayList;
import org.apache.avalon.framework.Version;
+import org.apache.avalon.framework.info.Attribute;
import org.apache.avalon.framework.info.ComponentDescriptor;
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.info.FeatureDescriptor;
-import org.apache.avalon.framework.info.Attribute;
import org.apache.avalon.phoenix.metainfo.BlockDescriptor;
import org.apache.avalon.phoenix.metainfo.BlockInfo;
import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
1.2 +6 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ConfigurationUtil.java
Index: ConfigurationUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ConfigurationUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationUtil.java 22 Sep 2002 08:51:09 -0000 1.1
+++ ConfigurationUtil.java 2 Oct 2002 11:25:56 -0000 1.2
@@ -7,13 +7,13 @@
*/
package org.apache.avalon.phoenix.components.util;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.w3c.dom.Text;
-import org.apache.avalon.framework.configuration.Configuration;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
/**
* This class has a bunch of utility methods to work
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ResourceUtil.java
Index: ResourceUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ResourceUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceUtil.java 6 Sep 2002 09:42:35 -0000 1.1
+++ ResourceUtil.java 2 Oct 2002 11:25:56 -0000 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.phoenix.components.util;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import java.io.File;
import java.net.MalformedURLException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
/**
* A utility class for working with resources in default sar layout.
1.18 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ApplicationContext.java 6 Sep 2002 09:42:35 -0000 1.17
+++ ApplicationContext.java 2 Oct 2002 11:25:56 -0000 1.18
@@ -7,12 +7,12 @@
*/
package org.apache.avalon.phoenix.interfaces;
+import java.io.InputStream;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.excalibur.threadcontext.ThreadContext;
-import java.io.InputStream;
/**
* Manage the "context" in which Applications operate.
1.15 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java
Index: Kernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Kernel.java 6 Sep 2002 09:42:35 -0000 1.14
+++ Kernel.java 2 Oct 2002 11:25:56 -0000 1.15
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.phoenix.interfaces;
+import java.io.File;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import java.io.File;
/**
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/FreeNEasyPolicy.java
Index: FreeNEasyPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/FreeNEasyPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FreeNEasyPolicy.java 21 Sep 2002 01:18:55 -0000 1.1
+++ FreeNEasyPolicy.java 2 Oct 2002 11:25:56 -0000 1.2
@@ -8,10 +8,10 @@
*/
package org.apache.avalon.phoenix.launcher;
-import java.security.Policy;
-import java.security.PermissionCollection;
import java.security.CodeSource;
+import java.security.PermissionCollection;
import java.security.Permissions;
+import java.security.Policy;
/**
* Default polic class to give every code base all permssions.
1.2 +6 -6
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/MockApplicationContext.java
Index: MockApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/MockApplicationContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockApplicationContext.java 1 Oct 2002 06:19:50 -0000 1.1
+++ MockApplicationContext.java 2 Oct 2002 11:25:56 -0000 1.2
@@ -7,15 +7,15 @@
*/
package org.apache.avalon.phoenix.components.application.test;
-import org.apache.avalon.phoenix.interfaces.ApplicationContext;
-import org.apache.avalon.phoenix.metadata.SarMetaData;
-import org.apache.avalon.framework.logger.Logger;
+import java.io.InputStream;
+import java.util.HashMap;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.phoenix.interfaces.ApplicationContext;
+import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
-import java.util.HashMap;
-import java.io.InputStream;
/**
*
1.2 +5 -5
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java
Index: AbstractContainerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractContainerTestCase.java 1 Oct 2002 06:16:59 -0000 1.1
+++ AbstractContainerTestCase.java 2 Oct 2002 11:25:56 -0000 1.2
@@ -7,14 +7,14 @@
*/
package org.apache.avalon.phoenix.test;
+import java.io.File;
+import java.net.URL;
import junit.framework.TestCase;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.tools.assembler.Assembler;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.configuration.Configuration;
-import java.io.File;
-import java.net.URL;
/**
* Abstract class which TestCases can extend.
1.3 +3 -3
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component1.java
Index: Component1.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Component1.java 1 Oct 2002 03:15:19 -0000 1.2
+++ Component1.java 2 Oct 2002 11:25:56 -0000 1.3
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.phoenix.test.data;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* A test component.
1.4 +4 -4
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component3.java
Index: Component3.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component3.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Component3.java 1 Oct 2002 06:16:25 -0000 1.3
+++ Component3.java 2 Oct 2002 11:25:56 -0000 1.4
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.phoenix.test.data;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
import java.util.Arrays;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* A test component.
1.4 +4 -5
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component4.java
Index: Component4.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component4.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Component4.java 1 Oct 2002 15:39:45 -0000 1.3
+++ Component4.java 2 Oct 2002 11:25:56 -0000 1.4
@@ -7,11 +7,10 @@
*/
package org.apache.avalon.phoenix.test.data;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import java.util.Arrays;
import java.util.Map;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* A test component.
1.2 +3 -4
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/metagenerate/test/IntegrationTestCase.java
Index: IntegrationTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/metagenerate/test/IntegrationTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntegrationTestCase.java 1 Oct 2002 06:43:14 -0000 1.1
+++ IntegrationTestCase.java 2 Oct 2002 11:25:56 -0000 1.2
@@ -7,12 +7,11 @@
*/
package org.apache.avalon.phoenix.tools.metagenerate.test;
-import junit.framework.TestCase;
-
-import java.io.FileReader;
import java.io.File;
-import java.io.LineNumberReader;
import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.LineNumberReader;
+import junit.framework.TestCase;
public class IntegrationTestCase extends TestCase
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
