donaldp 2002/10/01 18:52:25
Modified: assembly/src/java/org/apache/excalibur/merlin
DefaultController.java Main.java
assembly/src/java/org/apache/excalibur/merlin/assembly
AssemblyException.java
AssemblyRuntimeException.java ContainerManager.java
DefaultLoggerManager.java DependencyGraph.java
ProfileTable.java ServiceRegistry.java
TypeManager.java TypeRegistry.java TypeTable.java
assembly/src/java/org/apache/excalibur/merlin/container
Container.java ContainerFactory.java
ContainerHelper.java ContainerResource.java
DefaultContainer.java
assembly/src/java/org/apache/excalibur/merlin/kernel
DefaultKernel.java Kernel.java
assembly/src/java/org/apache/excalibur/merlin/model
Parameter.java Profile.java Resource.java
assembly/src/java/org/apache/excalibur/merlin/model/builder
ContainerBuilder.java ContainerCreator.java
ProfileBuilder.java ProfileCreator.java
XMLContainerCreator.java XMLProfileCreator.java
assembly/src/java/org/apache/excalibur/merlin/model/verifier
AssemblyVerifier.java MetaDataVerifier.java
assembly/src/java/org/apache/excalibur/merlin/resource
AbstractLifestyleHandler.java
DefaultComponentManager.java
DefaultLifestyleManager.java DefaultManager.java
DefaultResource.java DefaultResourceFactory.java
DefaultServiceAccessPoint.java
DefaultServiceManager.java DeploymentHelper.java
LifecycleHelper.java LifestyleManager.java
PooledLifestyleHandler.java ResourceFactory.java
ResourceProvider.java
TransientLifestyleHandler.java
assembly/src/java/org/apache/excalibur/merlin/service
DefaultRegistry.java InvalidPathException.java
Registry.java ServiceLocator.java
ServiceManagementContext.java ServicePublisher.java
ServiceURLFactory.java UnknownServiceException.java
assembly/src/java/org/apache/excalibur/playground
BasicComponent.java BasicContext.java
BasicContextInterface.java ComplexComponent.java
CustomContainer.java DemoManager.java
ExploitationManager.java SimpleComponent.java
TerminalComponent.java
baxter/src/java/org/apache/excalibur/baxter
MBeanInvocationHandler.java
configuration/src/java/org/apache/excalibur/configuration
ConfigurationUtil.java
configuration/src/java/org/apache/excalibur/configuration/merged
ConfigurationMerger.java ConfigurationSplitter.java
containerkit/src/java/org/apache/excalibur/containerkit/demo
SimpleResourceProvider.java
SimpleServiceKernel.java
containerkit/src/java/org/apache/excalibur/containerkit/demo/components
Component1.java
containerkit/src/java/org/apache/excalibur/containerkit/factory
DefaultComponentBundle.java
DefaultComponentFactory.java
containerkit/src/java/org/apache/excalibur/containerkit/kernel
AbstractServiceKernel.java
containerkit/src/java/org/apache/excalibur/containerkit/kernel/processor
DependencyMap.java PhaseProcessor.java
containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl
AbstractResourceProvider.java
containerkit/src/java/org/apache/excalibur/containerkit/metadata
MetaDataBuilder.java
containerkit/src/java/org/apache/excalibur/containerkit/verifier
AssemblyVerifier.java
event/src/test QueueTest.java
event/src/test/org/apache/excalibur/event/command/test
TPCThreadManagerTestCase.java
event/src/test/org/apache/excalibur/event/test
ThreadedQueueTestCase.java
event/src/test/org/apache/excalibur/mpool/test
PoolComparisonProfileAbstract.java
extension/src/java/org/apache/avalon/excalibur/packagemanager/impl
DefaultExtensionManager.java
DelegatingExtensionManager.java
NoopExtensionManager.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/components
TranslatorImpl.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended
Main.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/extensions
Extensions.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet
ServletContainer.java servlet.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
SwingContainer.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer
ComponentViewer.java Main.java
fortress/src/java/org/apache/excalibur/fortress
AbstractContainer.java DefaultContainerManager.java
fortress/src/java/org/apache/excalibur/fortress/container
DefaultContainer.java MetaDataContainer.java
fortress/src/java/org/apache/excalibur/fortress/container/commands
CheckTypeInfoCommand.java
fortress/src/java/org/apache/excalibur/fortress/handler
AbstractComponentHandler.java ComponentFactory.java
ThreadSafeComponentHandler.java
fortress/src/java/org/apache/excalibur/fortress/lifecycle
AbstractLifecycleExtensionManager.java
LifecycleExtensionManager.java
fortress/src/java/org/apache/excalibur/fortress/lookup
FortressServiceManager.java
fortress/src/java/org/apache/excalibur/fortress/util
AbstractRoleManager.java AssemblyMap.java
ComponentStateValidator.java ContextBuilder.java
ContextManager.java ExcaliburRoleManager.java
StaticAssemblyMap.java
loader/src/test/org/apache/excalibur/loader/reader/test
ReaderTestCase.java
loader/src/test/org/apache/excalibur/loader/test
LoaderTestSuite.java
loader/src/test/org/apache/excalibur/loader/verifier/test
VerifierTestCase.java
logger/src/java/org/apache/avalon/excalibur/logger
DefaultLogKitManager.java
logger/src/java/org/apache/avalon/excalibur/logger/factory
SMTPTargetFactory.java
meta/src/java/org/apache/excalibur/meta/info Descriptor.java
ServiceDefinition.java Type.java
meta/src/java/org/apache/excalibur/meta/info/builder
SerializedServiceCreator.java
SerializedTypeCreator.java ServiceCreator.java
TypeCreator.java XMLBlockCreator.java
XMLServiceCreator.java XMLTypeCreator.java
monitor/src/java/org/apache/avalon/excalibur/monitor
MonitorUtil.java
monitor/src/java/org/apache/avalon/excalibur/monitor/impl
AbstractMonitor.java PassiveMonitor.java
monitor/src/test/org/apache/avalon/excalibur/monitor/test
MonitorTestCaseListener.java
policy/src/java/org/apache/excalibur/policy/reader
PolicyReader.java
policy/src/java/org/apache/excalibur/policy/runtime
DefaultPolicy.java
pool/src/java/org/apache/avalon/excalibur/pool
ResourceLimitingPool.java
thread/src/java/org/apache/avalon/excalibur/thread/impl
BasicThreadPool.java DefaultThreadPool.java
ResourceLimitingThreadPool.java
thread/src/java/org/apache/excalibur/thread/impl
AbstractThreadPool.java
util/src/java/org/apache/excalibur/util
ComponentStateValidator.java
util/src/test/org/apache/excalibur/util/test
FullLifecycleComponent.java
xmlutil/src/java/org/apache/avalon/excalibur/xml
JaxpParser.java XercesParser.java
xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath
EmptyNodeList.java JaxenProcessorImpl.java
SimpleNodeList.java XPathProcessorImpl.java
xmlutil/src/java/org/apache/avalon/excalibur/xml/xslt
XSLTProcessorImpl.java
xmlutil/src/java/org/apache/excalibur/xml/dom
DOMSerializer.java DefaultDOMHandler.java
DefaultDOMHandlerFactory.java
DefaultDOMSerializer.java
xmlutil/src/java/org/apache/excalibur/xmlizer XMLizer.java
Log:
cleanup imports and code using idea
Revision Changes Path
1.20 +4 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.java
Index: DefaultController.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultController.java 2 Oct 2002 01:46:50 -0000 1.19
+++ DefaultController.java 2 Oct 2002 01:52:15 -0000 1.20
@@ -10,17 +10,16 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.FileNotFoundException;
-
+import java.io.InputStream;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configuration;
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.context.ContextException;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.excalibur.merlin.kernel.DefaultKernel;
/**
1.22 +1 -4
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Main.java 2 Oct 2002 01:46:50 -0000 1.21
+++ Main.java 2 Oct 2002 01:52:15 -0000 1.22
@@ -10,10 +10,7 @@
import java.io.File;
import java.io.FileNotFoundException;
-
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.ExceptionUtil;
-
import org.apache.excalibur.merlin.kernel.KernelException;
/**
1.4 +2 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/AssemblyException.java
Index: AssemblyException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/AssemblyException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AssemblyException.java 2 Oct 2002 01:46:50 -0000 1.3
+++ AssemblyException.java 2 Oct 2002 01:52:15 -0000 1.4
@@ -7,10 +7,9 @@
*/
package org.apache.excalibur.merlin.assembly;
-import java.util.Enumeration;
import java.util.Dictionary;
+import java.util.Enumeration;
import java.util.Hashtable;
-
import org.apache.avalon.framework.CascadingException;
/**
1.3 +2 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/AssemblyRuntimeException.java
Index: AssemblyRuntimeException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/AssemblyRuntimeException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssemblyRuntimeException.java 2 Oct 2002 01:46:50 -0000 1.2
+++ AssemblyRuntimeException.java 2 Oct 2002 01:52:15 -0000 1.3
@@ -7,10 +7,9 @@
*/
package org.apache.excalibur.merlin.assembly;
-import java.util.Enumeration;
import java.util.Dictionary;
+import java.util.Enumeration;
import java.util.Hashtable;
-
import org.apache.avalon.framework.CascadingRuntimeException;
/**
1.38 +23 -24
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ContainerManager.java 2 Oct 2002 01:46:50 -0000 1.37
+++ ContainerManager.java 2 Oct 2002 01:52:15 -0000 1.38
@@ -8,43 +8,42 @@
package org.apache.excalibur.merlin.assembly;
import java.io.File;
-import java.util.List;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.Hashtable;
import java.util.Iterator;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
+import java.util.LinkedList;
+import java.util.List;
+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.framework.context.DefaultContext;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.excalibur.merlin.resource.ResourceException;
-import org.apache.excalibur.merlin.resource.DefaultResource;
-import org.apache.excalibur.merlin.container.ContainerResource;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.merlin.container.Container;
-import org.apache.excalibur.merlin.resource.LifestyleHandler;
-import org.apache.excalibur.merlin.resource.LifestyleManager;
-import org.apache.excalibur.merlin.resource.LifecycleHelper;
-import org.apache.excalibur.merlin.resource.DeploymentHelper;
-import org.apache.excalibur.merlin.resource.ResourceFactory;
-import org.apache.excalibur.merlin.resource.DefaultResourceFactory;
-import org.apache.excalibur.merlin.model.ContainerDescriptor;
+import org.apache.excalibur.merlin.container.ContainerResource;
+import org.apache.excalibur.merlin.model.Association;
+import org.apache.excalibur.merlin.model.CategoriesDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
+import org.apache.excalibur.merlin.model.ContainerDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
-import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
-import org.apache.excalibur.merlin.model.CategoriesDescriptor;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.merlin.model.Association;
-import org.apache.excalibur.merlin.model.builder.ProfileBuilder;
import org.apache.excalibur.merlin.model.builder.ContainerBuilder;
-import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
-import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.merlin.model.builder.ProfileBuilder;
+import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
+import org.apache.excalibur.merlin.resource.DefaultResource;
+import org.apache.excalibur.merlin.resource.DeploymentHelper;
+import org.apache.excalibur.merlin.resource.LifecycleHelper;
+import org.apache.excalibur.merlin.resource.LifestyleHandler;
+import org.apache.excalibur.merlin.resource.LifestyleManager;
+import org.apache.excalibur.merlin.resource.ResourceException;
+import org.apache.excalibur.merlin.resource.ResourceFactory;
import org.apache.excalibur.meta.info.DependencyDescriptor;
import org.apache.excalibur.meta.info.ExtensionDescriptor;
+import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
+import org.apache.excalibur.meta.info.StageDescriptor;
import org.apache.excalibur.meta.info.Type;
/**
1.12 +10 -10
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DefaultLoggerManager.java
Index: DefaultLoggerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DefaultLoggerManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultLoggerManager.java 2 Oct 2002 01:46:50 -0000 1.11
+++ DefaultLoggerManager.java 2 Oct 2002 01:52:15 -0000 1.12
@@ -10,23 +10,23 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
-import org.apache.log.Hierarchy;
-import org.apache.log.LogTarget;
-import org.apache.log.Logger;
-import org.apache.log.Priority;
-import org.apache.log.output.io.FileTarget;
-import org.apache.log.output.io.StreamTarget;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.logger.AvalonFormatter;
import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.excalibur.merlin.model.TargetDescriptor;
+import org.apache.excalibur.merlin.model.CategoriesDescriptor;
+import org.apache.excalibur.merlin.model.Category;
+import org.apache.excalibur.merlin.model.FileTargetProvider;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
+import org.apache.excalibur.merlin.model.TargetDescriptor;
import org.apache.excalibur.merlin.model.TargetProvider;
-import org.apache.excalibur.merlin.model.FileTargetProvider;
-import org.apache.excalibur.merlin.model.Category;
-import org.apache.excalibur.merlin.model.CategoriesDescriptor;
+import org.apache.log.Hierarchy;
+import org.apache.log.LogTarget;
+import org.apache.log.Logger;
+import org.apache.log.Priority;
+import org.apache.log.output.io.FileTarget;
+import org.apache.log.output.io.StreamTarget;
/**
* A <code>LoggerManager</code> that supports management of a logging
hierarchy.
1.8 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DependencyGraph.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DependencyGraph.java 2 Oct 2002 01:46:50 -0000 1.7
+++ DependencyGraph.java 2 Oct 2002 01:52:15 -0000 1.8
@@ -8,8 +8,8 @@
package org.apache.excalibur.merlin.assembly;
import java.util.ArrayList;
-import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Association;
+import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.meta.info.DependencyDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
1.4 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ProfileTable.java
Index: ProfileTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ProfileTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfileTable.java 2 Oct 2002 01:46:50 -0000 1.3
+++ ProfileTable.java 2 Oct 2002 01:52:15 -0000 1.4
@@ -7,10 +7,10 @@
*/
package org.apache.excalibur.merlin.assembly;
-import java.util.List;
import java.util.LinkedList;
-import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import java.util.List;
import org.apache.excalibur.merlin.model.Profile;
+import org.apache.excalibur.meta.info.ReferenceDescriptor;
/**
* Internal table that holds references to the available component types
1.5 +2 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ServiceRegistry.java
Index: ServiceRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ServiceRegistry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServiceRegistry.java 2 Oct 2002 01:46:50 -0000 1.4
+++ ServiceRegistry.java 2 Oct 2002 01:52:15 -0000 1.5
@@ -7,14 +7,9 @@
*/
package org.apache.excalibur.merlin.assembly;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Iterator;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
import org.apache.excalibur.meta.info.ServiceDefinition;
import org.apache.excalibur.meta.info.builder.ServiceBuilder;
1.24 +24 -25
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java
Index: TypeManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TypeManager.java 2 Oct 2002 01:46:50 -0000 1.23
+++ TypeManager.java 2 Oct 2002 01:52:15 -0000 1.24
@@ -9,41 +9,40 @@
import java.io.File;
import java.io.IOException;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Vector;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Iterator;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
-import java.net.URLClassLoader;
-import java.net.URL;
-import java.net.JarURLConnection;
-
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
+import java.util.Vector;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+import org.apache.avalon.excalibur.extension.Extension;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.extension.Extension;
-import org.apache.avalon.excalibur.packagemanager.PackageManager;
import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
+import org.apache.avalon.excalibur.packagemanager.PackageManager;
import
org.apache.avalon.excalibur.packagemanager.impl.DefaultExtensionManager;
-import org.apache.excalibur.meta.info.Type;
-import org.apache.excalibur.meta.info.ReferenceDescriptor;
-import org.apache.excalibur.meta.info.ServiceDefinition;
-import org.apache.excalibur.merlin.model.IncludeDescriptor;
-import org.apache.excalibur.merlin.model.LibraryDescriptor;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.FilesetDescriptor;
+import org.apache.excalibur.merlin.model.IncludeDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
+import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.meta.info.ServiceDefinition;
+import org.apache.excalibur.meta.info.Type;
/**
* Abstract type manager.
1.17 +9 -9
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java
Index: TypeRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TypeRegistry.java 2 Oct 2002 01:46:50 -0000 1.16
+++ TypeRegistry.java 2 Oct 2002 01:52:15 -0000 1.17
@@ -7,21 +7,21 @@
*/
package org.apache.excalibur.merlin.assembly;
-import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Vector;
import java.util.Iterator;
-import org.apache.avalon.framework.logger.Logger;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.excalibur.meta.info.ExtensionDescriptor;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
-import org.apache.excalibur.meta.info.Type;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
-import org.apache.excalibur.meta.info.builder.TypeBuilder;
+import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.info.builder.BlockBuilder;
+import org.apache.excalibur.meta.info.builder.TypeBuilder;
import org.apache.excalibur.meta.verifier.ComponentVerifier;
/**
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeTable.java
Index: TypeTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeTable.java 2 Oct 2002 01:46:50 -0000 1.2
+++ TypeTable.java 2 Oct 2002 01:52:15 -0000 1.3
@@ -7,10 +7,10 @@
*/
package org.apache.excalibur.merlin.assembly;
-import java.util.List;
import java.util.LinkedList;
-import org.apache.avalon.framework.logger.Logger;
+import java.util.List;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
import org.apache.excalibur.meta.info.Type;
1.21 +1 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Container.java
Index: Container.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Container.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Container.java 2 Oct 2002 01:46:52 -0000 1.20
+++ Container.java 2 Oct 2002 01:52:16 -0000 1.21
@@ -9,8 +9,6 @@
package org.apache.excalibur.merlin.container;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.merlin.model.ClasspathDescriptor;
/**
* A <code>Container</code> is a manager of a set of components and as such,
is responsible
1.10 +2 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerFactory.java
Index: ContainerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContainerFactory.java 2 Oct 2002 01:46:52 -0000 1.9
+++ ContainerFactory.java 2 Oct 2002 01:52:16 -0000 1.10
@@ -12,11 +12,10 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.resource.ResourceFactory;
-import org.apache.excalibur.merlin.resource.LifestyleHandler;
-import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
+import org.apache.excalibur.merlin.resource.LifestyleHandler;
+import org.apache.excalibur.merlin.resource.ResourceFactory;
/**
* Default resource factory.
1.5 +6 -11
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerHelper.java
Index: ContainerHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainerHelper.java 2 Oct 2002 01:46:52 -0000 1.4
+++ ContainerHelper.java 2 Oct 2002 01:52:16 -0000 1.5
@@ -8,27 +8,22 @@
package org.apache.excalibur.merlin.container;
-import java.util.Map;
import java.util.Hashtable;
-import java.util.ArrayList;
-
+import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.excalibur.meta.info.Type;
-import org.apache.excalibur.merlin.assembly.KernelManager;
-import org.apache.excalibur.merlin.assembly.TypeException;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.assembly.DefaultLoggerManager;
-import org.apache.excalibur.merlin.model.ContainerDescriptor;
+import org.apache.excalibur.merlin.assembly.TypeException;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
+import org.apache.excalibur.merlin.model.ContainerDescriptor;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
import org.apache.excalibur.merlin.resource.LifestyleManager;
-import org.apache.excalibur.merlin.container.ContainerResource;
import org.apache.excalibur.merlin.service.Registry;
+import org.apache.excalibur.meta.info.Type;
/**
* Utility class that provides support for the creation of containers
1.6 +2 -9
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerResource.java
Index: ContainerResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerResource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContainerResource.java 2 Oct 2002 01:46:52 -0000 1.5
+++ ContainerResource.java 2 Oct 2002 01:52:16 -0000 1.6
@@ -8,21 +8,14 @@
package org.apache.excalibur.merlin.container;
import java.util.ArrayList;
-import java.util.List;
import java.util.LinkedList;
-
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
+import java.util.List;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
import org.apache.excalibur.merlin.resource.DefaultResource;
import org.apache.excalibur.merlin.resource.LifestyleHandler;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
-import org.apache.excalibur.merlin.ExceptionHelper;
/**
* A container resource is a resource that manages the execution of a
container
1.44 +8 -14
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java
Index: DefaultContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- DefaultContainer.java 2 Oct 2002 01:46:52 -0000 1.43
+++ DefaultContainer.java 2 Oct 2002 01:52:16 -0000 1.44
@@ -8,37 +8,31 @@
package org.apache.excalibur.merlin.container;
-import java.net.URL;
-import java.util.Map;
-import java.util.List;
-import java.util.Hashtable;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.Iterator;
-
-import org.apache.avalon.excalibur.i18n.Resources;
+import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.activity.Suspendable;
-import org.apache.avalon.framework.configuration.Configuration;
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.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.merlin.ExceptionHelper;
import org.apache.excalibur.merlin.assembly.AssemblyException;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.assembly.DependencyGraph;
import org.apache.excalibur.merlin.model.ContainerDescriptor;
-import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
-import org.apache.excalibur.merlin.container.ContainerResource;
-import org.apache.excalibur.merlin.service.Handler;
import org.apache.excalibur.merlin.service.Registry;
/**
1.55 +17 -20
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- DefaultKernel.java 2 Oct 2002 01:46:53 -0000 1.54
+++ DefaultKernel.java 2 Oct 2002 01:52:16 -0000 1.55
@@ -9,46 +9,43 @@
package org.apache.excalibur.merlin.kernel;
import java.io.File;
-import java.util.ArrayList;
import java.io.FileInputStream;
import java.io.InputStream;
-import java.net.URL;
-
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
+import java.util.ArrayList;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.parameters.Parameters;
+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.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.excalibur.event.command.TPCThreadManager;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.excalibur.event.command.CommandManager;
+import org.apache.excalibur.event.command.TPCThreadManager;
import org.apache.excalibur.merlin.ExceptionHelper;
import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.assembly.KernelManager;
import org.apache.excalibur.merlin.assembly.DefaultLoggerManager;
+import org.apache.excalibur.merlin.assembly.KernelManager;
import org.apache.excalibur.merlin.container.Container;
import org.apache.excalibur.merlin.container.ContainerHelper;
-import org.apache.excalibur.merlin.model.verifier.AssemblyVerifier;
-import org.apache.excalibur.merlin.model.verifier.MetaDataVerifier;
-import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
+import org.apache.excalibur.merlin.container.ContainerResource;
import org.apache.excalibur.merlin.model.CategoriesDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.merlin.container.ContainerResource;
-import org.apache.excalibur.merlin.resource.LifestyleManager;
+import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
+import org.apache.excalibur.merlin.model.verifier.AssemblyVerifier;
+import org.apache.excalibur.merlin.model.verifier.MetaDataVerifier;
import org.apache.excalibur.merlin.resource.DefaultLifestyleManager;
-import org.apache.excalibur.merlin.service.Registry;
+import org.apache.excalibur.merlin.resource.LifestyleManager;
import org.apache.excalibur.merlin.service.DefaultRegistry;
import org.apache.excalibur.meta.verifier.VerifyException;
import org.apache.excalibur.mpool.DefaultPoolManager;
1.17 +1 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/Kernel.java
Index: Kernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/Kernel.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Kernel.java 2 Oct 2002 01:46:53 -0000 1.16
+++ Kernel.java 2 Oct 2002 01:52:16 -0000 1.17
@@ -8,7 +8,6 @@
package org.apache.excalibur.merlin.kernel;
-import org.apache.excalibur.merlin.model.Resource;
import org.apache.excalibur.meta.verifier.VerifyException;
/**
1.10 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Parameter.java
Index: Parameter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Parameter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Parameter.java 2 Oct 2002 01:46:53 -0000 1.9
+++ Parameter.java 2 Oct 2002 01:52:16 -0000 1.10
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.merlin.model;
-import java.util.Map;
import java.lang.reflect.Constructor;
+import java.util.Map;
/**
* A <code>Parameter</code> represents a single constructor typed argument
value. A parameter
1.28 +5 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java
Index: Profile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Profile.java 2 Oct 2002 01:46:53 -0000 1.27
+++ Profile.java 2 Oct 2002 01:52:16 -0000 1.28
@@ -10,15 +10,15 @@
import java.io.InputStream;
import java.io.Serializable;
import java.util.Hashtable;
+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.framework.configuration.Configurable;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.excalibur.configuration.CascadingConfiguration;
+import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.excalibur.meta.ConfigurationBuilder;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.configuration.ConfigurationUtil;
-import org.apache.excalibur.configuration.CascadingConfiguration;
+import org.apache.excalibur.meta.info.Type;
import org.xml.sax.InputSource;
/**
1.10 +2 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Resource.java
Index: Resource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Resource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Resource.java 2 Oct 2002 01:46:53 -0000 1.9
+++ Resource.java 2 Oct 2002 01:52:16 -0000 1.10
@@ -8,10 +8,9 @@
package org.apache.excalibur.merlin.model;
import java.net.URL;
-
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
import org.apache.excalibur.meta.info.ServiceDescriptor;
-import org.apache.avalon.framework.activity.Disposable;
/**
* Interface implemented by object capable of supply a resources indepedently
1.7 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerBuilder.java
Index: ContainerBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContainerBuilder.java 2 Oct 2002 01:46:54 -0000 1.6
+++ ContainerBuilder.java 2 Oct 2002 01:52:16 -0000 1.7
@@ -10,8 +10,8 @@
import java.io.InputStream;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.merlin.model.ContainerDescriptor;
+import org.apache.excalibur.meta.info.Type;
/**
* A ContainerCreator is responsible for building [EMAIL PROTECTED]
ContainerDescriptor}
1.8 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerCreator.java
Index: ContainerCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContainerCreator.java 2 Oct 2002 01:46:54 -0000 1.7
+++ ContainerCreator.java 2 Oct 2002 01:52:16 -0000 1.8
@@ -9,8 +9,8 @@
import java.io.InputStream;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.merlin.model.ContainerDescriptor;
+import org.apache.excalibur.meta.info.Type;
/**
* Simple interface used to create [EMAIL PROTECTED] ContainerDescriptor}
1.8 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ProfileBuilder.java
Index: ProfileBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ProfileBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProfileBuilder.java 2 Oct 2002 01:46:54 -0000 1.7
+++ ProfileBuilder.java 2 Oct 2002 01:52:16 -0000 1.8
@@ -10,9 +10,9 @@
import java.io.InputStream;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.info.builder.TypeBuilder;
-import org.apache.excalibur.merlin.model.Profile;
/**
* A ProfileBuilder is responsible for building [EMAIL PROTECTED] Profile}
1.10 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ProfileCreator.java
Index: ProfileCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ProfileCreator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProfileCreator.java 2 Oct 2002 01:46:54 -0000 1.9
+++ ProfileCreator.java 2 Oct 2002 01:52:16 -0000 1.10
@@ -9,8 +9,8 @@
import java.io.InputStream;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.merlin.model.Profile;
+import org.apache.excalibur.meta.info.Type;
/**
* Simple interface used to create [EMAIL PROTECTED] Profile}
1.15 +10 -10
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerCreator.java
Index: XMLContainerCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerCreator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLContainerCreator.java 2 Oct 2002 01:46:54 -0000 1.14
+++ XMLContainerCreator.java 2 Oct 2002 01:52:16 -0000 1.15
@@ -15,23 +15,23 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.CategoriesDescriptor;
import org.apache.excalibur.merlin.model.Category;
+import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.ContainerDescriptor;
-import org.apache.excalibur.merlin.model.IncludeDescriptor;
+import org.apache.excalibur.merlin.model.ContextDirective;
+import org.apache.excalibur.merlin.model.Entry;
+import org.apache.excalibur.merlin.model.FileTargetProvider;
import org.apache.excalibur.merlin.model.FilesetDescriptor;
-import org.apache.excalibur.merlin.model.ClasspathDescriptor;
+import org.apache.excalibur.merlin.model.Import;
+import org.apache.excalibur.merlin.model.IncludeDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
+import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.TargetDescriptor;
import org.apache.excalibur.merlin.model.TargetProvider;
-import org.apache.excalibur.merlin.model.FileTargetProvider;
-import org.apache.excalibur.merlin.model.LibraryDescriptor;
-import org.apache.excalibur.merlin.model.ContextDirective;
-import org.apache.excalibur.merlin.model.Import;
-import org.apache.excalibur.merlin.model.Entry;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.ConfigurationBuilder;
+import org.apache.excalibur.meta.info.Type;
import org.xml.sax.InputSource;
/**
1.20 +7 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLProfileCreator.java
Index: XMLProfileCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLProfileCreator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLProfileCreator.java 2 Oct 2002 01:46:54 -0000 1.19
+++ XMLProfileCreator.java 2 Oct 2002 01:52:16 -0000 1.20
@@ -16,16 +16,16 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.excalibur.meta.info.Type;
-import org.apache.excalibur.meta.info.builder.XMLTypeCreator;
-import org.apache.excalibur.meta.ConfigurationBuilder;
-import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Category;
import org.apache.excalibur.merlin.model.CategoriesDescriptor;
+import org.apache.excalibur.merlin.model.Category;
import org.apache.excalibur.merlin.model.ContextDirective;
-import org.apache.excalibur.merlin.model.Import;
import org.apache.excalibur.merlin.model.Entry;
+import org.apache.excalibur.merlin.model.Import;
import org.apache.excalibur.merlin.model.Parameter;
+import org.apache.excalibur.merlin.model.Profile;
+import org.apache.excalibur.meta.ConfigurationBuilder;
+import org.apache.excalibur.meta.info.Type;
+import org.apache.excalibur.meta.info.builder.XMLTypeCreator;
import org.xml.sax.InputSource;
/**
1.7 +6 -6
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/AssemblyVerifier.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AssemblyVerifier.java 2 Oct 2002 01:46:54 -0000 1.6
+++ AssemblyVerifier.java 2 Oct 2002 01:52:17 -0000 1.7
@@ -12,13 +12,13 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.meta.info.Type;
-import org.apache.excalibur.meta.verifier.VerifyException;
+import org.apache.excalibur.merlin.model.Association;
+import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.meta.info.DependencyDescriptor;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
-import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Association;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
+import org.apache.excalibur.meta.info.Type;
+import org.apache.excalibur.meta.verifier.VerifyException;
/**
* This Class verifies that a set of profiles are valid. It performs a number
1.10 +4 -4
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/MetaDataVerifier.java
Index: MetaDataVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/MetaDataVerifier.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MetaDataVerifier.java 2 Oct 2002 01:46:54 -0000 1.9
+++ MetaDataVerifier.java 2 Oct 2002 01:52:17 -0000 1.10
@@ -15,13 +15,13 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.info.ContextDescriptor;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.verifier.VerifyException;
+import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.verifier.ComponentVerifier;
+import org.apache.excalibur.meta.verifier.VerifyException;
/**
* This Class verifies that an implementation is valid wrt the
1.13 +1 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/AbstractLifestyleHandler.java
Index: AbstractLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/AbstractLifestyleHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractLifestyleHandler.java 2 Oct 2002 01:46:54 -0000 1.12
+++ AbstractLifestyleHandler.java 2 Oct 2002 01:52:17 -0000 1.13
@@ -10,12 +10,10 @@
package org.apache.excalibur.merlin.resource;
import java.util.Map;
-
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.container.lifecycle.Accessor;
-import org.apache.excalibur.merlin.container.Container;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
1.5 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultComponentManager.java
Index: DefaultComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultComponentManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultComponentManager.java 2 Oct 2002 01:46:54 -0000 1.4
+++ DefaultComponentManager.java 2 Oct 2002 01:52:17 -0000 1.5
@@ -9,7 +9,6 @@
*/
package org.apache.excalibur.merlin.resource;
-import java.util.Map;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
1.8 +5 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultLifestyleManager.java
Index: DefaultLifestyleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultLifestyleManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultLifestyleManager.java 2 Oct 2002 01:46:54 -0000 1.7
+++ DefaultLifestyleManager.java 2 Oct 2002 01:52:17 -0000 1.8
@@ -9,13 +9,13 @@
*/
package org.apache.excalibur.merlin.resource;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.mpool.PoolManager;
1.8 +5 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultManager.java
Index: DefaultManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultManager.java 2 Oct 2002 01:46:54 -0000 1.7
+++ DefaultManager.java 2 Oct 2002 01:52:17 -0000 1.8
@@ -9,15 +9,15 @@
*/
package org.apache.excalibur.merlin.resource;
-import java.util.Map;
+import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Hashtable;
-import java.lang.reflect.Method;
-import org.apache.excalibur.merlin.model.Resource;
+import java.util.Map;
+import org.apache.excalibur.merlin.model.Association;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
+import org.apache.excalibur.merlin.model.Resource;
import org.apache.excalibur.meta.info.DependencyDescriptor;
-import org.apache.excalibur.merlin.model.Association;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.Type;
/**
1.11 +6 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultResource.java
Index: DefaultResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultResource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultResource.java 2 Oct 2002 01:46:54 -0000 1.10
+++ DefaultResource.java 2 Oct 2002 01:52:17 -0000 1.11
@@ -8,17 +8,16 @@
package org.apache.excalibur.merlin.resource;
import java.net.URL;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.ServiceAccessPoint;
import org.apache.excalibur.merlin.model.Resource;
+import org.apache.excalibur.merlin.model.ServiceAccessPoint;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.ServiceDefinition;
-import org.apache.excalibur.merlin.assembly.ContainerManager;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
/**
* Opaque type that maps a path to a profile.
1.4 +1 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultResourceFactory.java
Index: DefaultResourceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultResourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultResourceFactory.java 2 Oct 2002 01:46:54 -0000 1.3
+++ DefaultResourceFactory.java 2 Oct 2002 01:52:17 -0000 1.4
@@ -9,10 +9,9 @@
*/
package org.apache.excalibur.merlin.resource;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultServiceAccessPoint.java
Index: DefaultServiceAccessPoint.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultServiceAccessPoint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServiceAccessPoint.java 2 Oct 2002 01:46:54 -0000 1.2
+++ DefaultServiceAccessPoint.java 2 Oct 2002 01:52:17 -0000 1.3
@@ -7,10 +7,10 @@
*/
package org.apache.excalibur.merlin.resource;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
-import org.apache.excalibur.meta.info.ServiceDefinition;
import org.apache.excalibur.merlin.model.Resource;
import org.apache.excalibur.merlin.model.ServiceAccessPoint;
+import org.apache.excalibur.meta.info.ServiceDefinition;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
/**
* Interface through which the service descriptor of a service can
1.4 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultServiceManager.java
Index: DefaultServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DefaultServiceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultServiceManager.java 15 Sep 2002 00:19:37 -0000 1.3
+++ DefaultServiceManager.java 2 Oct 2002 01:52:17 -0000 1.4
@@ -9,7 +9,6 @@
*/
package org.apache.excalibur.merlin.resource;
-import java.util.Map;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.merlin.model.Profile;
1.12 +8 -12
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DeploymentHelper.java
Index: DeploymentHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/DeploymentHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DeploymentHelper.java 2 Oct 2002 01:46:54 -0000 1.11
+++ DeploymentHelper.java 2 Oct 2002 01:52:17 -0000 1.12
@@ -7,12 +7,11 @@
*/
package org.apache.excalibur.merlin.resource;
+import java.lang.reflect.Constructor;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.HashMap;
-import java.lang.reflect.Constructor;
-
+import java.util.Hashtable;
+import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.ComponentManager;
@@ -25,23 +24,20 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-
-import org.apache.excalibur.merlin.assembly.KernelManager;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.assembly.DefaultLoggerManager;
-import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.ContextDirective;
+import org.apache.excalibur.merlin.assembly.KernelManager;
import org.apache.excalibur.merlin.model.CategoriesDescriptor;
import org.apache.excalibur.merlin.model.Category;
-import org.apache.excalibur.merlin.model.Import;
+import org.apache.excalibur.merlin.model.ContextDirective;
import org.apache.excalibur.merlin.model.Entry;
-import org.apache.excalibur.merlin.model.Association;
-import org.apache.excalibur.meta.info.DependencyDescriptor;
+import org.apache.excalibur.merlin.model.Import;
+import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.meta.info.ContextDescriptor;
import org.apache.excalibur.meta.info.EntryDescriptor;
-import org.apache.excalibur.meta.info.StageDescriptor;
import org.apache.excalibur.meta.info.ExtensionDescriptor;
import org.apache.excalibur.meta.info.LoggerDescriptor;
+import org.apache.excalibur.meta.info.StageDescriptor;
import org.apache.excalibur.meta.info.Type;
/**
1.14 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifecycleHelper.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LifecycleHelper.java 2 Oct 2002 01:46:55 -0000 1.13
+++ LifecycleHelper.java 2 Oct 2002 01:52:17 -0000 1.14
@@ -26,7 +26,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-
import org.apache.excalibur.container.lifecycle.Creator;
import org.apache.excalibur.merlin.container.Container;
import org.apache.excalibur.merlin.model.Profile;
1.6 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifestyleManager.java
Index: LifestyleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifestyleManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LifestyleManager.java 2 Oct 2002 01:46:55 -0000 1.5
+++ LifestyleManager.java 2 Oct 2002 01:52:17 -0000 1.6
@@ -10,8 +10,8 @@
package org.apache.excalibur.merlin.resource;
import org.apache.avalon.framework.context.Context;
-import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.assembly.ContainerManager;
+import org.apache.excalibur.merlin.model.Profile;
/**
* Utility class that handles the establishment of an appropriate lifestyle
1.6 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/PooledLifestyleHandler.java
Index: PooledLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/PooledLifestyleHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PooledLifestyleHandler.java 2 Oct 2002 01:46:55 -0000 1.5
+++ PooledLifestyleHandler.java 2 Oct 2002 01:52:17 -0000 1.6
@@ -11,9 +11,9 @@
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.mpool.PoolManager;
-import org.apache.excalibur.mpool.Pool;
import org.apache.excalibur.mpool.ObjectFactory;
+import org.apache.excalibur.mpool.Pool;
+import org.apache.excalibur.mpool.PoolManager;
/**
* Lifestyle implementation that provides suppport for the pooled
1.3 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceFactory.java
Index: ResourceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceFactory.java 2 Oct 2002 01:46:55 -0000 1.2
+++ ResourceFactory.java 2 Oct 2002 01:52:17 -0000 1.3
@@ -12,7 +12,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.Resource;
/**
1.7 +3 -4
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceProvider.java
Index: ResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceProvider.java 2 Oct 2002 01:46:55 -0000 1.6
+++ ResourceProvider.java 2 Oct 2002 01:52:17 -0000 1.7
@@ -9,18 +9,17 @@
package org.apache.excalibur.merlin.resource;
import java.util.Map;
-
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.meta.info.StageDescriptor;
import org.apache.excalibur.merlin.model.Profile;
+import org.apache.excalibur.meta.info.StageDescriptor;
/**
* Internal class that handles the establishment of component instances
based on a supplied
1.8 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/TransientLifestyleHandler.java
Index: TransientLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/TransientLifestyleHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransientLifestyleHandler.java 2 Oct 2002 01:46:55 -0000 1.7
+++ TransientLifestyleHandler.java 2 Oct 2002 01:52:17 -0000 1.8
@@ -10,7 +10,6 @@
package org.apache.excalibur.merlin.resource;
import java.util.ArrayList;
-
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
1.8 +3 -4
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/DefaultRegistry.java
Index: DefaultRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/DefaultRegistry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultRegistry.java 2 Oct 2002 01:46:55 -0000 1.7
+++ DefaultRegistry.java 2 Oct 2002 01:52:17 -0000 1.8
@@ -7,13 +7,12 @@
*/
package org.apache.excalibur.merlin.service;
-import java.net.URL;
import java.net.MalformedURLException;
-import java.util.Map;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
-
+import java.util.Map;
import org.apache.excalibur.merlin.model.Resource;
/**
1.7 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/InvalidPathException.java
Index: InvalidPathException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/InvalidPathException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InvalidPathException.java 2 Oct 2002 01:46:55 -0000 1.6
+++ InvalidPathException.java 2 Oct 2002 01:52:17 -0000 1.7
@@ -8,7 +8,7 @@
package org.apache.excalibur.merlin.service;
-import java.net.URL;
+
/**
* Exception to indicate that service URI is invalid.
1.5 +1 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/Registry.java
Index: Registry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/Registry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Registry.java 2 Oct 2002 01:46:55 -0000 1.4
+++ Registry.java 2 Oct 2002 01:52:17 -0000 1.5
@@ -7,9 +7,7 @@
*/
package org.apache.excalibur.merlin.service;
-import java.net.URL;
import java.net.MalformedURLException;
-
import org.apache.excalibur.merlin.model.Resource;
/**
1.4 +1 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceLocator.java
Index: ServiceLocator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceLocator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceLocator.java 2 Oct 2002 01:46:55 -0000 1.3
+++ ServiceLocator.java 2 Oct 2002 01:52:17 -0000 1.4
@@ -8,7 +8,6 @@
package org.apache.excalibur.merlin.service;
import java.net.URL;
-
import org.apache.excalibur.merlin.model.Resource;
/**
1.7 +1 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceManagementContext.java
Index: ServiceManagementContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceManagementContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceManagementContext.java 2 Oct 2002 01:46:55 -0000 1.6
+++ ServiceManagementContext.java 2 Oct 2002 01:52:17 -0000 1.7
@@ -7,9 +7,7 @@
*/
package org.apache.excalibur.merlin.service;
-import java.net.URL;
import java.net.MalformedURLException;
-
import org.apache.excalibur.merlin.model.Resource;
/**
1.4 +1 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServicePublisher.java
Index: ServicePublisher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServicePublisher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServicePublisher.java 2 Oct 2002 01:46:55 -0000 1.3
+++ ServicePublisher.java 2 Oct 2002 01:52:17 -0000 1.4
@@ -8,7 +8,6 @@
package org.apache.excalibur.merlin.service;
import java.net.URL;
-
import org.apache.excalibur.merlin.model.Resource;
/**
1.5 +1 -4
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceURLFactory.java
Index: ServiceURLFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceURLFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServiceURLFactory.java 2 Oct 2002 01:46:55 -0000 1.4
+++ ServiceURLFactory.java 2 Oct 2002 01:52:18 -0000 1.5
@@ -10,11 +10,8 @@
package org.apache.excalibur.merlin.service;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandlerFactory;
import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
/**
* URL protocol handler factory for the native access protocol.
1.8 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/UnknownServiceException.java
Index: UnknownServiceException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/UnknownServiceException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UnknownServiceException.java 2 Oct 2002 01:46:55 -0000 1.7
+++ UnknownServiceException.java 2 Oct 2002 01:52:18 -0000 1.8
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.merlin.service;
-import java.net.URL;
+
/**
* Exception to indicate that a requested service is unknown.
1.7 +6 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicComponent.java
Index: BasicComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicComponent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicComponent.java 2 Oct 2002 01:46:56 -0000 1.6
+++ BasicComponent.java 2 Oct 2002 01:52:18 -0000 1.7
@@ -1,15 +1,14 @@
package org.apache.excalibur.playground;
import java.io.File;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* This is a minimal demonstration component that implements the
1.6 +1 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicContext.java
Index: BasicContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicContext.java 2 Oct 2002 01:46:56 -0000 1.5
+++ BasicContext.java 2 Oct 2002 01:52:18 -0000 1.6
@@ -1,8 +1,7 @@
package org.apache.excalibur.playground;
-import java.util.Map;
import java.io.File;
-
+import java.util.Map;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.DefaultContext;
1.4 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicContextInterface.java
Index: BasicContextInterface.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicContextInterface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicContextInterface.java 2 Oct 2002 01:46:56 -0000 1.3
+++ BasicContextInterface.java 2 Oct 2002 01:52:18 -0000 1.4
@@ -1,7 +1,6 @@
package org.apache.excalibur.playground;
import java.io.File;
-
import org.apache.avalon.framework.context.Context;
/**
1.5 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.java
Index: ComplexComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComplexComponent.java 2 Oct 2002 01:46:56 -0000 1.4
+++ ComplexComponent.java 2 Oct 2002 01:52:18 -0000 1.5
@@ -8,8 +8,8 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* This is a demonstration component that declares no interface but
1.5 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/CustomContainer.java
Index: CustomContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/CustomContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CustomContainer.java 2 Oct 2002 01:46:56 -0000 1.4
+++ CustomContainer.java 2 Oct 2002 01:52:18 -0000 1.5
@@ -1,8 +1,8 @@
package org.apache.excalibur.playground;
import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.container.DefaultContainer;
import org.apache.excalibur.merlin.container.ContainerException;
+import org.apache.excalibur.merlin.container.DefaultContainer;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
1.6 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.java
Index: DemoManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DemoManager.java 2 Oct 2002 01:46:56 -0000 1.5
+++ DemoManager.java 2 Oct 2002 01:52:18 -0000 1.6
@@ -1,11 +1,11 @@
package org.apache.excalibur.playground;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.excalibur.container.lifecycle.Creator;
import org.apache.excalibur.container.lifecycle.Accessor;
+import org.apache.excalibur.container.lifecycle.Creator;
/**
* Definition of an extension type that logs messages related to
1.5 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ExploitationManager.java
Index: ExploitationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ExploitationManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExploitationManager.java 2 Oct 2002 01:46:56 -0000 1.4
+++ ExploitationManager.java 2 Oct 2002 01:52:18 -0000 1.5
@@ -1,10 +1,10 @@
package org.apache.excalibur.playground;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.container.lifecycle.Creator;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
/**
* Definition of an extension handler that handles the Expoitable
1.6 +7 -8
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.java
Index: SimpleComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleComponent.java 2 Oct 2002 01:46:56 -0000 1.5
+++ SimpleComponent.java 2 Oct 2002 01:52:18 -0000 1.6
@@ -1,15 +1,14 @@
package org.apache.excalibur.playground;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-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.configuration.Configuration;
-import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.excalibur.merlin.assembly.ContainerManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* This is a minimal demonstration component that a dependency on
1.4 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/TerminalComponent.java
Index: TerminalComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/TerminalComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TerminalComponent.java 2 Oct 2002 01:46:56 -0000 1.3
+++ TerminalComponent.java 2 Oct 2002 01:52:18 -0000 1.4
@@ -1,7 +1,7 @@
package org.apache.excalibur.playground;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* This is a minimal demonstration component that provides BasicService
1.2 +1 -1
jakarta-avalon-excalibur/baxter/src/java/org/apache/excalibur/baxter/MBeanInvocationHandler.java
Index: MBeanInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/baxter/src/java/org/apache/excalibur/baxter/MBeanInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MBeanInvocationHandler.java 13 Sep 2002 11:29:13 -0000 1.1
+++ MBeanInvocationHandler.java 2 Oct 2002 01:52:18 -0000 1.2
@@ -1 +1 @@
-/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.baxter;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
import javax.management.ReflectionException;
/**
* An [EMAIL PROTECTED] InvocationHandler} for MBeans.
* Allows you to invoke MBean as if they were normal objects if
* they implement all the methods in an interface.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version CVS $Revision$ $Date$
*/
public class MBeanInvocationHandler
implements InvocationHandler
{
/**
* Map of methods onto parameter type arrays.
*/
private final Map m_methodMap = new HashMap();
/**
* The MBeanServer to call methods on.
*/
private final MBeanServer m_mBeanServer;
/**
* The name of object we are to invoke.
*/
private final ObjectName m_objectName;
/**
* Create a Proxy for MBean that implements specified
* interfaces. It is expected that the MBean as registered
* will have all of those methods implemented.
*
* @param mBeanServer the MBeanServer
* @param objectName the name of object
* @param services the service interfaces to proxy
* @return the proxied MBean
*/
public static Object createProxy( final MBeanServer mBeanServer,
final ObjectName objectName,
final Class[] services )
{
final ClassLoader classLoader =
MBeanInvocationHandler.class.getClassLoader();
final MBeanInvocationHandler handler =
new MBeanInvocationHandler( mBeanServer, objectName );
return Proxy.newProxyInstance( classLoader, services, handler );
}
/**
* Create InvocationHandler for specified
* ObjectName on specified MBeanServer.
*
* @param mBeanServer the MBeanServer
* @param objectName the name of object
*/
public MBeanInvocationHandler( final MBeanServer mBeanServer,
final ObjectName objectName )
{
if( null == mBeanServer )
{
throw new NullPointerException( "mBeanServer" );
}
if( null == objectName )
{
throw new NullPointerException( "objectName" );
}
m_mBeanServer = mBeanServer;
m_objectName = objectName;
}
/**
* Return the MBeanServer the InvocationHandler calls methods using.
*
* @return the MBeanServer the InvocationHandler calls methods using.
*/
protected MBeanServer getMBeanServer()
{
return m_mBeanServer;
}
/**
* Return the ObjectName designating object to call methods on.
*
* @return the ObjectName designating object to call methods on.
*/
protected ObjectName getObjectName()
{
return m_objectName;
}
/**
* Invoke a method on a MBean.
*/
public Object invoke( final Object proxy,
final Method method,
final Object[] args )
throws Throwable
{
final String[] paramTypes = getParamTypes( method );
try
{
return getMBeanServer().invoke( getObjectName(),
method.getName(),
args,
paramTypes );
}
catch( InstanceNotFoundException e )
{
throw new IllegalStateException( e.toString() );
}
catch( MBeanException e )
{
throw e.getTargetException();
}
catch( ReflectionException e )
{
throw new IllegalStateException( e.toString() );
}
}
/**
* Get a list of param types for method.
*/
private synchronized String[] getParamTypes( final Method method )
{
String[] paramTypes = (String[])m_methodMap.get( method );
if( null == paramTypes )
{
paramTypes = calcParamTypes( method );
m_methodMap.put( method, paramTypes );
}
return paramTypes;
}
/**
* Create a list of strings that name types
* of a methods parameters. This is derived from
* method object.
*/
private String[] calcParamTypes( final Method method )
{
final Class[] parameterClasses = method.getParameterTypes();
final String[] paramTypes = new String[ parameterClasses.length ];
for( int i = 0; i < paramTypes.length; i++ )
{
paramTypes[ i ] = parameterClasses[ i ].getName();
}
return paramTypes;
}
}
\ No newline at end of file
+/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.baxter;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ReflectionException;
/**
* An [EMAIL PROTECTED] InvocationHandler} for MBeans.
* Allows you to invoke MBean as if they were normal objects if
* they implement all the methods in an interface.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version CVS $Revision$ $Date$
*/
public class MBeanInvocationHandler
implements InvocationHandler
{
/**
* Map of methods onto parameter type arrays.
*/
private final Map m_methodMap = new HashMap();
/**
* The MBeanServer to call methods on.
*/
private final MBeanServer m_mBeanServer;
/**
* The name of object we are to invoke.
*/
private final ObjectName m_objectName;
/**
* Create a Proxy for MBean that implements specified
* interfaces. It is expected that the MBean as registered
* will have all of those methods implemented.
*
* @param mBeanServer the MBeanServer
* @param objectName the name of object
* @param services the service interfaces to proxy
* @return the proxied MBean
*/
public static Object createProxy( final MBeanServer mBeanServer,
final ObjectName objectName,
final Class[] services )
{
final ClassLoader classLoader =
MBeanInvocationHandler.class.getClassLoader();
final MBeanInvocationHandler handler =
new MBeanInvocationHandler( mBeanServer, objectName );
return Proxy.newProxyInstance( classLoader, services, handler );
}
/**
* Create InvocationHandler for specified
* ObjectName on specified MBeanServer.
*
* @param mBeanServer the MBeanServer
* @param objectName the name of object
*/
public MBeanInvocationHandler( final MBeanServer mBeanServer,
final ObjectName objectName )
{
if( null == mBeanServer )
{
throw new NullPointerException( "mBeanServer" );
}
if( null == objectName )
{
throw new NullPointerException( "objectName" );
}
m_mBeanServer = mBeanServer;
m_objectName = objectName;
}
/**
* Return the MBeanServer the InvocationHandler calls methods using.
*
* @return the MBeanServer the InvocationHandler calls methods using.
*/
protected MBeanServer getMBeanServer()
{
return m_mBeanServer;
}
/**
* Return the ObjectName designating object to call methods on.
*
* @return the ObjectName designating object to call methods on.
*/
protected ObjectName getObjectName()
{
return m_objectName;
}
/**
* Invoke a method on a MBean.
*/
public Object invoke( final Object proxy,
final Method method,
final Object[] args )
throws Throwable
{
final String[] paramTypes = getParamTypes( method );
try
{
return getMBeanServer().invoke( getObjectName(),
method.getName(),
args,
paramTypes );
}
catch( InstanceNotFoundException e )
{
throw new IllegalStateException( e.toString() );
}
catch( MBeanException e )
{
throw e.getTargetException();
}
catch( ReflectionException e )
{
throw new IllegalStateException( e.toString() );
}
}
/**
* Get a list of param types for method.
*/
private synchronized String[] getParamTypes( final Method method )
{
String[] paramTypes = (String[])m_methodMap.get( method );
if( null == paramTypes )
{
paramTypes = calcParamTypes( method );
m_methodMap.put( method, paramTypes );
}
return paramTypes;
}
/**
* Create a list of strings that name types
* of a methods parameters. This is derived from
* method object.
*/
private String[] calcParamTypes( final Method method )
{
final Class[] parameterClasses = method.getParameterTypes();
final String[] paramTypes = new String[ parameterClasses.length ];
for( int i = 0; i < paramTypes.length; i++ )
{
paramTypes[ i ] = parameterClasses[ i ].getName();
}
return paramTypes;
}
}
\ No newline at end of file
1.8 +0 -1
jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/ConfigurationUtil.java
Index: ConfigurationUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/ConfigurationUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurationUtil.java 2 Oct 2002 01:46:57 -0000 1.7
+++ ConfigurationUtil.java 2 Oct 2002 01:52:18 -0000 1.8
@@ -12,7 +12,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.configuration.AbstractConfiguration;
import org.apache.avalon.framework.configuration.Configuration;
1.5 +0 -1
jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/merged/ConfigurationMerger.java
Index: ConfigurationMerger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/merged/ConfigurationMerger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConfigurationMerger.java 2 Oct 2002 01:46:57 -0000 1.4
+++ ConfigurationMerger.java 2 Oct 2002 01:52:18 -0000 1.5
@@ -9,7 +9,6 @@
import java.util.HashSet;
import java.util.Set;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
1.3 +0 -1
jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/merged/ConfigurationSplitter.java
Index: ConfigurationSplitter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/merged/ConfigurationSplitter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurationSplitter.java 2 Oct 2002 01:46:57 -0000 1.2
+++ ConfigurationSplitter.java 2 Oct 2002 01:52:18 -0000 1.3
@@ -8,7 +8,6 @@
package org.apache.excalibur.configuration.merged;
import java.util.HashSet;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
1.4 +3 -3
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/SimpleResourceProvider.java
Index: SimpleResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/SimpleResourceProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleResourceProvider.java 2 Oct 2002 01:46:57 -0000 1.3
+++ SimpleResourceProvider.java 2 Oct 2002 01:52:19 -0000 1.4
@@ -9,10 +9,10 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.containerkit.factory.ComponentFactory;
-import
org.apache.excalibur.containerkit.lifecycle.impl.AbstractResourceProvider;
-import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.kernel.AbstractServiceKernel;
import org.apache.excalibur.containerkit.kernel.ComponentEntry;
+import
org.apache.excalibur.containerkit.lifecycle.impl.AbstractResourceProvider;
+import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
/**
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
1.2 +2 -4
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/SimpleServiceKernel.java
Index: SimpleServiceKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/SimpleServiceKernel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleServiceKernel.java 23 Aug 2002 08:51:15 -0000 1.1
+++ SimpleServiceKernel.java 2 Oct 2002 01:52:19 -0000 1.2
@@ -14,12 +14,10 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.excalibur.containerkit.factory.ComponentFactory;
import org.apache.excalibur.containerkit.factory.DefaultComponentFactory;
+import org.apache.excalibur.containerkit.kernel.AbstractServiceKernel;
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.MetaDataBuilder;
-import org.apache.excalibur.containerkit.demo.SimpleMetaDataBuilder;
-import org.apache.excalibur.containerkit.demo.SimpleResourceProvider;
-import org.apache.excalibur.containerkit.kernel.AbstractServiceKernel;
/**
* This is a simple ServiceKernel.
1.5 +5 -6
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components/Component1.java
Index: Component1.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components/Component1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Component1.java 13 Sep 2002 15:43:33 -0000 1.4
+++ Component1.java 2 Oct 2002 01:52:19 -0000 1.5
@@ -7,17 +7,16 @@
*/
package org.apache.excalibur.containerkit.demo.components;
+import org.apache.avalon.framework.activity.Initializable;
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.framework.activity.Initializable;
-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.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import java.lang.ClassLoader;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* @avalon.component lifestyle="alternative" version="1.4"
1.3 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/DefaultComponentBundle.java
Index: DefaultComponentBundle.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/DefaultComponentBundle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultComponentBundle.java 31 Aug 2002 10:57:50 -0000 1.2
+++ DefaultComponentBundle.java 2 Oct 2002 01:52:19 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.containerkit.factory;
-import org.apache.avalon.framework.info.ComponentInfo;
import java.io.InputStream;
+import org.apache.avalon.framework.info.ComponentInfo;
/**
*
1.12 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/DefaultComponentFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultComponentFactory.java 31 Aug 2002 10:57:50 -0000 1.11
+++ DefaultComponentFactory.java 2 Oct 2002 01:52:19 -0000 1.12
@@ -9,9 +9,9 @@
import java.util.Map;
import java.util.WeakHashMap;
+import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.tools.infobuilder.ComponentInfoBuilder;
/**
1.32 +5 -5
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/AbstractServiceKernel.java
Index: AbstractServiceKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/AbstractServiceKernel.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- AbstractServiceKernel.java 2 Oct 2002 01:46:57 -0000 1.31
+++ AbstractServiceKernel.java 2 Oct 2002 01:52:19 -0000 1.32
@@ -8,23 +8,23 @@
package org.apache.excalibur.containerkit.kernel;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.containerkit.kernel.processor.DependencyMap;
+import org.apache.excalibur.containerkit.factory.ComponentBundle;
import org.apache.excalibur.containerkit.factory.ComponentFactory;
+import org.apache.excalibur.containerkit.kernel.processor.DependencyMap;
import org.apache.excalibur.containerkit.lifecycle.LifecycleHelper;
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.registry.ComponentProfile;
-import org.apache.avalon.framework.info.ComponentInfo;
-import org.apache.excalibur.containerkit.factory.ComponentBundle;
/**
* The <code>AbstractServiceKernel</code> defines an application scope
through
1.2 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/processor/DependencyMap.java
Index: DependencyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/processor/DependencyMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyMap.java 9 Sep 2002 12:07:46 -0000 1.1
+++ DependencyMap.java 2 Oct 2002 01:52:19 -0000 1.2
@@ -11,10 +11,10 @@
import java.util.Collection;
import java.util.List;
import org.apache.avalon.framework.info.DependencyDescriptor;
+import org.apache.excalibur.containerkit.kernel.ComponentStore;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
import org.apache.excalibur.containerkit.registry.ComponentProfile;
-import org.apache.excalibur.containerkit.kernel.ComponentStore;
/**
* Utility class to help aquire a ordered graph of
1.2 +3 -3
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/processor/PhaseProcessor.java
Index: PhaseProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/processor/PhaseProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PhaseProcessor.java 9 Sep 2002 12:07:46 -0000 1.1
+++ PhaseProcessor.java 2 Oct 2002 01:52:19 -0000 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.containerkit.kernel.processor;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.containerkit.registry.ComponentProfile;
/**
1.18 +7 -7
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl/AbstractResourceProvider.java
Index: AbstractResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl/AbstractResourceProvider.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractResourceProvider.java 31 Aug 2002 10:58:08 -0000 1.17
+++ AbstractResourceProvider.java 2 Oct 2002 01:52:19 -0000 1.18
@@ -15,21 +15,21 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.DefaultComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.info.ComponentInfo;
+import org.apache.avalon.framework.info.ContextDescriptor;
+import org.apache.avalon.framework.info.EntryDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.excalibur.containerkit.factory.ComponentBundle;
+import org.apache.excalibur.containerkit.factory.ComponentFactory;
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.framework.info.ComponentInfo;
-import org.apache.avalon.framework.info.ContextDescriptor;
-import org.apache.avalon.framework.info.EntryDescriptor;
-import org.apache.excalibur.containerkit.factory.ComponentBundle;
-import org.apache.excalibur.containerkit.factory.ComponentFactory;
/**
* This is a base object via which the
1.2 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/MetaDataBuilder.java
Index: MetaDataBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/MetaDataBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetaDataBuilder.java 23 Aug 2002 08:39:34 -0000 1.1
+++ MetaDataBuilder.java 2 Oct 2002 01:52:19 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.containerkit.metadata;
-import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
+
/**
* Load metadata from some source. The source is usually
1.39 +4 -4
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- AssemblyVerifier.java 2 Oct 2002 01:46:57 -0000 1.38
+++ AssemblyVerifier.java 2 Oct 2002 01:52:19 -0000 1.39
@@ -11,13 +11,13 @@
import java.util.Stack;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
-import org.apache.excalibur.containerkit.registry.ComponentProfile;
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.info.DependencyDescriptor;
import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.tools.verifier.VerifyException;
+import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
+import org.apache.excalibur.containerkit.registry.ComponentProfile;
/**
* This Class verifies that Sars are valid. It performs a number
1.9 +2 -2 jakarta-avalon-excalibur/event/src/test/QueueTest.java
Index: QueueTest.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/src/test/QueueTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- QueueTest.java 3 Sep 2002 17:43:00 -0000 1.8
+++ QueueTest.java 2 Oct 2002 01:52:19 -0000 1.9
@@ -49,11 +49,11 @@
*/
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.excalibur.event.impl.DefaultQueue;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.SinkException;
import org.apache.excalibur.event.Source;
+import org.apache.excalibur.event.impl.DefaultQueue;
/**
* Simple test to expose the thread queue bug
1.12 +2 -4
jakarta-avalon-excalibur/event/src/test/org/apache/excalibur/event/command/test/TPCThreadManagerTestCase.java
Index: TPCThreadManagerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/test/org/apache/excalibur/event/command/test/TPCThreadManagerTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TPCThreadManagerTestCase.java 2 Oct 2002 01:46:58 -0000 1.11
+++ TPCThreadManagerTestCase.java 2 Oct 2002 01:52:19 -0000 1.12
@@ -51,9 +51,8 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-
+import junit.framework.TestCase;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.excalibur.event.impl.DefaultQueue;
import org.apache.excalibur.event.EventHandler;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.event.Sink;
@@ -61,8 +60,7 @@
import org.apache.excalibur.event.Source;
import org.apache.excalibur.event.command.EventPipeline;
import org.apache.excalibur.event.command.TPCThreadManager;
-
-import junit.framework.TestCase;
+import org.apache.excalibur.event.impl.DefaultQueue;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Gregory Steuck</a>
1.10 +2 -2
jakarta-avalon-excalibur/event/src/test/org/apache/excalibur/event/test/ThreadedQueueTestCase.java
Index: ThreadedQueueTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/test/org/apache/excalibur/event/test/ThreadedQueueTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ThreadedQueueTestCase.java 3 Sep 2002 17:43:01 -0000 1.9
+++ ThreadedQueueTestCase.java 2 Oct 2002 01:52:19 -0000 1.10
@@ -50,11 +50,11 @@
package org.apache.excalibur.event.test;
import junit.framework.TestCase;
-import org.apache.excalibur.event.impl.DefaultQueue;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.SinkException;
import org.apache.excalibur.event.Source;
+import org.apache.excalibur.event.impl.DefaultQueue;
/**
* Simple test to expose the thread queue bug
1.5 +2 -2
jakarta-avalon-excalibur/event/src/test/org/apache/excalibur/mpool/test/PoolComparisonProfileAbstract.java
Index: PoolComparisonProfileAbstract.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/test/org/apache/excalibur/mpool/test/PoolComparisonProfileAbstract.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolComparisonProfileAbstract.java 14 Aug 2002 16:59:55 -0000
1.4
+++ PoolComparisonProfileAbstract.java 2 Oct 2002 01:52:20 -0000
1.5
@@ -54,8 +54,8 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.excalibur.mpool.FixedSizePool;
import org.apache.excalibur.mpool.BlockingFixedSizePool;
+import org.apache.excalibur.mpool.FixedSizePool;
import org.apache.excalibur.mpool.ObjectFactory;
import org.apache.excalibur.mpool.Pool;
import org.apache.excalibur.mpool.VariableSizePool;
1.3 +2 -2
jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/packagemanager/impl/DefaultExtensionManager.java
Index: DefaultExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/packagemanager/impl/DefaultExtensionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultExtensionManager.java 7 Aug 2002 05:44:03 -0000 1.2
+++ DefaultExtensionManager.java 2 Oct 2002 01:52:20 -0000 1.3
@@ -14,9 +14,9 @@
import java.util.StringTokenizer;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import org.apache.avalon.excalibur.extension.Extension;
import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
-import org.apache.avalon.excalibur.extension.Extension;
/**
* <p>Interface used to contain "Optional Packages" (formerly known as
1.3 +2 -2
jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/packagemanager/impl/DelegatingExtensionManager.java
Index: DelegatingExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/packagemanager/impl/DelegatingExtensionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DelegatingExtensionManager.java 7 Aug 2002 05:44:03 -0000 1.2
+++ DelegatingExtensionManager.java 2 Oct 2002 01:52:20 -0000 1.3
@@ -8,9 +8,9 @@
package org.apache.avalon.excalibur.packagemanager.impl;
import java.util.ArrayList;
+import org.apache.avalon.excalibur.extension.Extension;
import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
-import org.apache.avalon.excalibur.extension.Extension;
/**
* A [EMAIL PROTECTED]
org.apache.avalon.excalibur.packagemanager.ExtensionManager} that can delegate
to multiple
1.3 +2 -2
jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/packagemanager/impl/NoopExtensionManager.java
Index: NoopExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/packagemanager/impl/NoopExtensionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NoopExtensionManager.java 7 Aug 2002 05:44:03 -0000 1.2
+++ NoopExtensionManager.java 2 Oct 2002 01:52:20 -0000 1.3
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.excalibur.packagemanager.impl;
+import org.apache.avalon.excalibur.extension.Extension;
import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
-import org.apache.avalon.excalibur.extension.Extension;
/**
* A Noop PackageRepository that can't provide any extensions.
1.7 +3 -6
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/components/TranslatorImpl.java
Index: TranslatorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/components/TranslatorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TranslatorImpl.java 2 Oct 2002 01:46:58 -0000 1.6
+++ TranslatorImpl.java 2 Oct 2002 01:52:20 -0000 1.7
@@ -52,14 +52,11 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-
-import org.apache.excalibur.instrument.AbstractLogEnabledInstrumentable;
-import org.apache.excalibur.instrument.CounterInstrument;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.excalibur.instrument.AbstractLogEnabledInstrumentable;
+import org.apache.excalibur.instrument.CounterInstrument;
/**
* Simple implementation of the <code>Translator</code> component, which
1.9 +1 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/Main.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Main.java 2 Oct 2002 01:46:59 -0000 1.8
+++ Main.java 2 Oct 2002 01:52:20 -0000 1.9
@@ -49,7 +49,6 @@
*/
package org.apache.excalibur.fortress.examples.extended;
-import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
1.7 +1 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/extensions/Extensions.java
Index: Extensions.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/extensions/Extensions.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Extensions.java 2 Oct 2002 01:46:59 -0000 1.6
+++ Extensions.java 2 Oct 2002 01:52:20 -0000 1.7
@@ -51,7 +51,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.container.lifecycle.AbstractAccessor;
-import org.apache.excalibur.fortress.AbstractContainer;
/**
* Some custom extensions for this container's components.
1.9 +1 -6
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/ServletContainer.java
Index: ServletContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/ServletContainer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServletContainer.java 2 Oct 2002 01:46:59 -0000 1.8
+++ ServletContainer.java 2 Oct 2002 01:52:20 -0000 1.9
@@ -51,14 +51,9 @@
import java.io.IOException;
import java.io.PrintWriter;
-
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-
import org.apache.excalibur.fortress.container.DefaultContainer;
import org.apache.excalibur.fortress.examples.components.Translator;
1.9 +1 -3
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/servlet.java
Index: servlet.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/servlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- servlet.java 2 Oct 2002 01:46:59 -0000 1.8
+++ servlet.java 2 Oct 2002 01:52:20 -0000 1.9
@@ -50,12 +50,10 @@
package org.apache.excalibur.fortress.examples.servlet;
import java.io.IOException;
-
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
-
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
1.8 +3 -7
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.java
Index: SwingContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SwingContainer.java 2 Oct 2002 01:46:59 -0000 1.7
+++ SwingContainer.java 2 Oct 2002 01:52:20 -0000 1.8
@@ -49,18 +49,14 @@
*/
package org.apache.excalibur.fortress.examples.swing;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.Dimension;
-import javax.swing.JFrame;
import javax.swing.JComboBox;
+import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
-
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-
import org.apache.excalibur.fortress.container.DefaultContainer;
import org.apache.excalibur.fortress.examples.components.Translator;
1.4 +1 -6
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/ComponentViewer.java
Index: ComponentViewer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/ComponentViewer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentViewer.java 2 Oct 2002 01:46:59 -0000 1.3
+++ ComponentViewer.java 2 Oct 2002 01:52:20 -0000 1.4
@@ -9,20 +9,15 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import java.util.Iterator;
import java.util.Set;
-
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JPanel;
-
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-
import org.apache.excalibur.fortress.container.DefaultContainer;
/**
1.9 +1 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/Main.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Main.java 2 Oct 2002 01:46:59 -0000 1.8
+++ Main.java 2 Oct 2002 01:52:20 -0000 1.9
@@ -50,7 +50,6 @@
package org.apache.excalibur.fortress.examples.viewer;
import org.apache.avalon.framework.CascadingException;
-import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
1.61 +17 -13
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- AbstractContainer.java 2 Oct 2002 01:46:59 -0000 1.60
+++ AbstractContainer.java 2 Oct 2002 01:52:20 -0000 1.61
@@ -53,31 +53,35 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.avalon.excalibur.collections.BucketMap;
import org.apache.avalon.excalibur.collections.FixedSizeBuffer;
import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.component.*;
-import org.apache.avalon.framework.configuration.*;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.*;
-import org.apache.avalon.framework.logger.*;
-import org.apache.avalon.framework.service.*;
-
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.excalibur.container.legacy.*;
import org.apache.excalibur.event.Queue;
-import org.apache.excalibur.fortress.container.commands.*;
+import
org.apache.excalibur.fortress.container.commands.DisposeComponentHandlerCommand;
+import
org.apache.excalibur.fortress.container.commands.InitializeComponentHandlerCommand;
import org.apache.excalibur.fortress.handler.ComponentHandler;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.fortress.lookup.FortressServiceManager;
import org.apache.excalibur.fortress.lookup.FortressServiceSelector;
import org.apache.excalibur.fortress.util.ExcaliburRoleManager;
import org.apache.excalibur.fortress.util.RoleManager;
-import org.apache.excalibur.instrument.Instrumentable;
import org.apache.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.instrument.Instrumentable;
import org.apache.excalibur.mpool.PoolManager;
-
-import org.apache.excalibur.container.legacy.*;
/**
* The Container is an interface used to mark the Containers in your system.
1.27 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java
Index: DefaultContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultContainerManager.java 2 Oct 2002 01:46:59 -0000 1.26
+++ DefaultContainerManager.java 2 Oct 2002 01:52:20 -0000 1.27
@@ -66,8 +66,8 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.excalibur.fortress.util.ContextManager;
import org.apache.excalibur.fortress.util.ComponentStateValidator;
+import org.apache.excalibur.fortress.util.ContextManager;
/**
* The ContainerManager is a single point of contact to manage your Container
1.7 +3 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/DefaultContainer.java
Index: DefaultContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/DefaultContainer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultContainer.java 2 Oct 2002 01:47:00 -0000 1.6
+++ DefaultContainer.java 2 Oct 2002 01:52:21 -0000 1.7
@@ -49,13 +49,13 @@
*/
package org.apache.excalibur.fortress.container;
-import org.apache.excalibur.fortress.AbstractContainer;
+import org.apache.avalon.framework.component.ComponentManager;
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.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.excalibur.fortress.AbstractContainer;
/**
* This is the default container, and it marks the default markup for
1.8 +20 -25
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/MetaDataContainer.java
Index: MetaDataContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/MetaDataContainer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MetaDataContainer.java 2 Oct 2002 01:47:00 -0000 1.7
+++ MetaDataContainer.java 2 Oct 2002 01:52:21 -0000 1.8
@@ -49,40 +49,35 @@
*/
package org.apache.excalibur.fortress.container;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.List;
-
import org.apache.avalon.excalibur.collections.BucketMap;
import org.apache.avalon.excalibur.collections.FixedSizeBuffer;
import org.apache.avalon.excalibur.logger.LoggerManager;
-
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.context.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.service.*;
-import org.apache.avalon.framework.logger.*;
-
-import org.apache.excalibur.fortress.container.commands.*;
-import org.apache.excalibur.fortress.*;
-import org.apache.excalibur.fortress.handler.*;
-import org.apache.excalibur.fortress.lifecycle.*;
-import org.apache.excalibur.fortress.lookup.*;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+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.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.container.classloader.*;
import org.apache.excalibur.container.legacy.*;
-
-import org.apache.excalibur.event.*;
+import org.apache.excalibur.event.Queue;
+import org.apache.excalibur.event.SinkException;
import org.apache.excalibur.event.command.Command;
-import org.apache.excalibur.instrument.Instrumentable;
+import org.apache.excalibur.fortress.Container;
+import org.apache.excalibur.fortress.ContainerManagerConstants;
+import org.apache.excalibur.fortress.container.commands.CheckTypeInfoCommand;
+import
org.apache.excalibur.fortress.container.commands.CommandFinishedListener;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.mpool.PoolManager;
-
-import org.apache.excalibur.meta.info.*;
-import org.apache.excalibur.meta.info.builder.*;
-import org.apache.excalibur.meta.verifier.*;
/**
* The MetaDataContainer is the wave of the future. While the
1.7 +2 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/CheckTypeInfoCommand.java
Index: CheckTypeInfoCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/CheckTypeInfoCommand.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CheckTypeInfoCommand.java 2 Oct 2002 01:47:00 -0000 1.6
+++ CheckTypeInfoCommand.java 2 Oct 2002 01:52:21 -0000 1.7
@@ -51,11 +51,10 @@
import java.util.Iterator;
import java.util.Map;
-
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.excalibur.event.command.Command;
import org.apache.excalibur.container.classloader.JarEntries;
+import org.apache.excalibur.event.command.Command;
import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
import org.apache.excalibur.meta.info.Type;
1.16 +3 -5
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java
Index: AbstractComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractComponentHandler.java 2 Oct 2002 01:47:00 -0000 1.15
+++ AbstractComponentHandler.java 2 Oct 2002 01:52:21 -0000 1.16
@@ -49,10 +49,6 @@
*/
package org.apache.excalibur.fortress.handler;
-import org.apache.excalibur.instrument.AbstractInstrumentable;
-import org.apache.excalibur.instrument.Instrument;
-import org.apache.excalibur.instrument.InstrumentManager;
-
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -61,6 +57,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
+import org.apache.excalibur.instrument.AbstractInstrumentable;
+import org.apache.excalibur.instrument.InstrumentManager;
/**
* AbstractComponentHandler class, ensures components are initialized
1.26 +7 -9
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ComponentFactory.java 2 Oct 2002 01:47:00 -0000 1.25
+++ ComponentFactory.java 2 Oct 2002 01:52:21 -0000 1.26
@@ -49,12 +49,6 @@
*/
package org.apache.excalibur.fortress.handler;
-import org.apache.excalibur.instrument.CounterInstrument;
-import org.apache.excalibur.instrument.Instrument;
-import org.apache.excalibur.instrument.Instrumentable;
-import org.apache.excalibur.instrument.InstrumentManageable;
-import org.apache.excalibur.instrument.InstrumentManager;
-
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.container.ContainerUtil;
@@ -65,9 +59,13 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.container.legacy.LegacyComponentManager;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
+import org.apache.excalibur.instrument.CounterInstrument;
+import org.apache.excalibur.instrument.Instrument;
+import org.apache.excalibur.instrument.InstrumentManageable;
+import org.apache.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.instrument.Instrumentable;
import org.apache.excalibur.mpool.ObjectFactory;
/**
1.27 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java
Index: ThreadSafeComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ThreadSafeComponentHandler.java 13 Aug 2002 07:57:26 -0000 1.26
+++ ThreadSafeComponentHandler.java 2 Oct 2002 01:52:21 -0000 1.27
@@ -53,7 +53,6 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
1.8 +1 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lifecycle/AbstractLifecycleExtensionManager.java
Index: AbstractLifecycleExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lifecycle/AbstractLifecycleExtensionManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractLifecycleExtensionManager.java 2 Oct 2002 01:47:00 -0000
1.7
+++ AbstractLifecycleExtensionManager.java 2 Oct 2002 01:52:21 -0000
1.8
@@ -49,10 +49,8 @@
*/
package org.apache.excalibur.fortress.lifecycle;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
import org.apache.excalibur.container.lifecycle.Accessor;
import org.apache.excalibur.container.lifecycle.Creator;
1.10 +1 -4
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lifecycle/LifecycleExtensionManager.java
Index: LifecycleExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lifecycle/LifecycleExtensionManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LifecycleExtensionManager.java 2 Oct 2002 01:47:01 -0000 1.9
+++ LifecycleExtensionManager.java 2 Oct 2002 01:52:21 -0000 1.10
@@ -53,10 +53,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.context.Context;
-
import org.apache.excalibur.container.lifecycle.Accessor;
import org.apache.excalibur.container.lifecycle.Creator;
1.16 +3 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceManager.java
Index: FortressServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FortressServiceManager.java 2 Oct 2002 01:47:01 -0000 1.15
+++ FortressServiceManager.java 2 Oct 2002 01:52:21 -0000 1.16
@@ -56,11 +56,11 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.excalibur.container.legacy.*;
+import org.apache.excalibur.container.lookup.AbstractServiceManager;
import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.handler.ComponentHandler;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
-import org.apache.excalibur.container.lookup.AbstractServiceManager;
-import org.apache.excalibur.container.legacy.*;
/**
* This is the Default ServiceManager for the Container. It provides
1.16 +2 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java
Index: AbstractRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractRoleManager.java 2 Oct 2002 01:47:01 -0000 1.15
+++ AbstractRoleManager.java 2 Oct 2002 01:52:21 -0000 1.16
@@ -49,11 +49,10 @@
*/
package org.apache.excalibur.fortress.util;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* The Excalibur Role Manager is used for Excalibur Role Mappings. All of
1.3 +2 -1
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AssemblyMap.java
Index: AssemblyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AssemblyMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssemblyMap.java 2 Oct 2002 01:47:01 -0000 1.2
+++ AssemblyMap.java 2 Oct 2002 01:52:21 -0000 1.3
@@ -49,7 +49,8 @@
*/
package org.apache.excalibur.fortress.util;
-import org.apache.excalibur.meta.info.*;
+import org.apache.excalibur.meta.info.DependencyDescriptor;
+import org.apache.excalibur.meta.info.Type;
/**
* The AssemblyMap takes care of the mapping logic for the assembly files.
The
1.3 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ComponentStateValidator.java
Index: ComponentStateValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ComponentStateValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentStateValidator.java 2 Oct 2002 01:47:01 -0000 1.2
+++ ComponentStateValidator.java 2 Oct 2002 01:52:21 -0000 1.3
@@ -12,7 +12,6 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.activity.Suspendable;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Reconfigurable;
@@ -21,6 +20,7 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.service.Serviceable;
/**
* This class provides basic facilities for enforcing Avalon's contracts
1.25 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ContextBuilder.java 2 Oct 2002 01:47:01 -0000 1.24
+++ ContextBuilder.java 2 Oct 2002 01:52:21 -0000 1.25
@@ -50,15 +50,14 @@
package org.apache.excalibur.fortress.util;
import java.io.File;
-import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
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.service.ServiceManager;
import org.apache.excalibur.event.Queue;
+import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.mpool.PoolManager;
/**
1.43 +4 -8
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ContextManager.java 2 Oct 2002 01:47:01 -0000 1.42
+++ ContextManager.java 2 Oct 2002 01:52:21 -0000 1.43
@@ -51,10 +51,8 @@
import java.util.ArrayList;
import java.util.Iterator;
-
-import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
-
+import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.DefaultComponentManager;
@@ -68,16 +66,15 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-
import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.command.CommandManager;
-import org.apache.excalibur.event.command.ThreadManager;
import org.apache.excalibur.event.command.TPCThreadManager;
+import org.apache.excalibur.event.command.ThreadManager;
import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.excalibur.mpool.DefaultPoolManager;
import org.apache.excalibur.mpool.PoolManager;
@@ -85,7 +82,6 @@
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.impl.ResourceSourceFactory;
import org.apache.excalibur.source.impl.SourceResolverImpl;
-
import org.apache.log.Hierarchy;
import org.apache.log.Priority;
1.18 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ExcaliburRoleManager.java 13 Aug 2002 07:57:27 -0000 1.17
+++ ExcaliburRoleManager.java 2 Oct 2002 01:52:21 -0000 1.18
@@ -51,7 +51,6 @@
import java.util.Collections;
import java.util.HashMap;
-
import org.apache.avalon.framework.activity.Initializable;
/**
1.3 +12 -6
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/StaticAssemblyMap.java
Index: StaticAssemblyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/StaticAssemblyMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StaticAssemblyMap.java 2 Oct 2002 01:47:01 -0000 1.2
+++ StaticAssemblyMap.java 2 Oct 2002 01:52:21 -0000 1.3
@@ -49,18 +49,24 @@
*/
package org.apache.excalibur.fortress.util;
-import org.apache.excalibur.meta.info.*;
-import org.apache.avalon.framework.context.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.logger.*;
-import org.apache.avalon.framework.Version;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.avalon.framework.Version;
+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.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.excalibur.meta.info.DependencyDescriptor;
+import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
+import org.apache.excalibur.meta.info.Type;
/**
* The AssemblyMap takes care of the mapping logic for the assembly files.
The
1.3 +1 -1
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/reader/test/ReaderTestCase.java
Index: ReaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/reader/test/ReaderTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReaderTestCase.java 20 Sep 2002 09:59:00 -0000 1.2
+++ ReaderTestCase.java 2 Oct 2002 01:52:21 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.loader.reader.test;
-import org.apache.excalibur.loader.reader.ClassLoaderSetReader;
import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
+import org.apache.excalibur.loader.reader.ClassLoaderSetReader;
import org.apache.excalibur.loader.test.AbstractLoaderTestCase;
/**
1.6 +1 -1
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/LoaderTestSuite.java
Index: LoaderTestSuite.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/LoaderTestSuite.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoaderTestSuite.java 1 Oct 2002 13:10:28 -0000 1.5
+++ LoaderTestSuite.java 2 Oct 2002 01:52:22 -0000 1.6
@@ -10,8 +10,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.excalibur.loader.reader.test.ReaderTestCase;
-import org.apache.excalibur.loader.verifier.test.VerifierTestCase;
import org.apache.excalibur.loader.runtime.test.JoinClassLoaderTestCase;
+import org.apache.excalibur.loader.verifier.test.VerifierTestCase;
/**
* A basic test suite that tests all the Loader package.
1.7 +1 -1
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/verifier/test/VerifierTestCase.java
Index: VerifierTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/verifier/test/VerifierTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VerifierTestCase.java 25 Sep 2002 11:16:46 -0000 1.6
+++ VerifierTestCase.java 2 Oct 2002 01:52:22 -0000 1.7
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.loader.verifier.test;
-import org.apache.excalibur.loader.reader.ClassLoaderSetReader;
import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
+import org.apache.excalibur.loader.reader.ClassLoaderSetReader;
import org.apache.excalibur.loader.test.AbstractLoaderTestCase;
import org.apache.excalibur.loader.verifier.ClassLoaderVerifier;
1.4 +2 -2
jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
Index: DefaultLogKitManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLogKitManager.java 7 Aug 2002 13:36:59 -0000 1.3
+++ DefaultLogKitManager.java 2 Oct 2002 01:52:22 -0000 1.4
@@ -54,13 +54,13 @@
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.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.Logger;
1.4 +2 -3
jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SMTPTargetFactory.java
Index: SMTPTargetFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/factory/SMTPTargetFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SMTPTargetFactory.java 2 Oct 2002 01:47:03 -0000 1.3
+++ SMTPTargetFactory.java 2 Oct 2002 01:52:22 -0000 1.4
@@ -49,11 +49,10 @@
*/
package org.apache.avalon.excalibur.logger.factory;
-import javax.mail.Session;
import javax.mail.Address;
+import javax.mail.Session;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.ContextException;
1.4 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/Descriptor.java
Index: Descriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/Descriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Descriptor.java 2 Oct 2002 01:47:03 -0000 1.3
+++ Descriptor.java 2 Oct 2002 01:52:22 -0000 1.4
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.meta.info;
-import java.util.Properties;
import java.io.Serializable;
+import java.util.Properties;
/**
* This is the Abstract class for all feature feature descriptors.
1.4 +1 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/ServiceDefinition.java
Index: ServiceDefinition.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/ServiceDefinition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceDefinition.java 2 Oct 2002 01:47:03 -0000 1.3
+++ ServiceDefinition.java 2 Oct 2002 01:52:22 -0000 1.4
@@ -8,7 +8,6 @@
package org.apache.excalibur.meta.info;
import java.util.Properties;
-
import org.apache.avalon.framework.Version;
/**
1.7 +3 -4
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/Type.java
Index: Type.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/Type.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Type.java 2 Oct 2002 01:47:03 -0000 1.6
+++ Type.java 2 Oct 2002 01:52:22 -0000 1.7
@@ -7,12 +7,11 @@
*/
package org.apache.excalibur.meta.info;
-import java.io.Serializable;
-import org.xml.sax.InputSource;
import java.io.InputStream;
-
+import java.io.Serializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.excalibur.meta.ConfigurationBuilder;
+import org.xml.sax.InputSource;
/**
* This class contains the meta information about a particular
1.4 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/SerializedServiceCreator.java
Index: SerializedServiceCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/SerializedServiceCreator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SerializedServiceCreator.java 2 Oct 2002 01:47:03 -0000 1.3
+++ SerializedServiceCreator.java 2 Oct 2002 01:52:22 -0000 1.4
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.meta.info.builder;
-import org.apache.excalibur.meta.info.ServiceDefinition;
import java.io.InputStream;
import java.io.ObjectInputStream;
+import org.apache.excalibur.meta.info.ServiceDefinition;
/**
* Create [EMAIL PROTECTED] ServiceDefinition} from stream made up of a
serialized object.
1.4 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/SerializedTypeCreator.java
Index: SerializedTypeCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/SerializedTypeCreator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SerializedTypeCreator.java 2 Oct 2002 01:47:03 -0000 1.3
+++ SerializedTypeCreator.java 2 Oct 2002 01:52:22 -0000 1.4
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.meta.info.builder;
-import org.apache.excalibur.meta.info.Type;
import java.io.InputStream;
import java.io.ObjectInputStream;
+import org.apache.excalibur.meta.info.Type;
/**
* Create [EMAIL PROTECTED] Type} from stream made up of
1.3 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/ServiceCreator.java
Index: ServiceCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/ServiceCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceCreator.java 22 Sep 2002 07:55:15 -0000 1.2
+++ ServiceCreator.java 2 Oct 2002 01:52:22 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.meta.info.builder;
-import org.apache.excalibur.meta.info.ServiceDefinition;
import java.io.InputStream;
+import org.apache.excalibur.meta.info.ServiceDefinition;
/**
* Interface used to create a [EMAIL PROTECTED] ServiceDefinition}
1.3 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/TypeCreator.java
Index: TypeCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/TypeCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeCreator.java 21 Aug 2002 03:34:32 -0000 1.2
+++ TypeCreator.java 2 Oct 2002 01:52:22 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.meta.info.builder;
-import org.apache.excalibur.meta.info.Type;
import java.io.InputStream;
+import org.apache.excalibur.meta.info.Type;
/**
* Simple interface used to create [EMAIL PROTECTED] Type}
1.5 +5 -5
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLBlockCreator.java
Index: XMLBlockCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLBlockCreator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLBlockCreator.java 2 Oct 2002 01:47:03 -0000 1.4
+++ XMLBlockCreator.java 2 Oct 2002 01:52:22 -0000 1.5
@@ -15,16 +15,16 @@
import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.excalibur.meta.ConfigurationBuilder;
import org.apache.excalibur.meta.info.ComponentDescriptor;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.info.ContextDescriptor;
import org.apache.excalibur.meta.info.DependencyDescriptor;
+import org.apache.excalibur.meta.info.ExtensionDescriptor;
import org.apache.excalibur.meta.info.LoggerDescriptor;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
-import org.apache.excalibur.meta.ConfigurationBuilder;
+import org.apache.excalibur.meta.info.Type;
import org.xml.sax.InputSource;
/**
1.6 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLServiceCreator.java
Index: XMLServiceCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLServiceCreator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLServiceCreator.java 2 Oct 2002 01:47:03 -0000 1.5
+++ XMLServiceCreator.java 2 Oct 2002 01:52:22 -0000 1.6
@@ -15,8 +15,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.meta.info.ServiceDefinition;
import org.apache.excalibur.meta.ConfigurationBuilder;
+import org.apache.excalibur.meta.info.ServiceDefinition;
import org.xml.sax.InputSource;
/**
1.11 +5 -6
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLTypeCreator.java 2 Oct 2002 01:47:03 -0000 1.10
+++ XMLTypeCreator.java 2 Oct 2002 01:52:22 -0000 1.11
@@ -16,18 +16,17 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.excalibur.meta.ConfigurationBuilder;
import org.apache.excalibur.meta.info.ComponentDescriptor;
-import org.apache.excalibur.meta.info.Type;
import org.apache.excalibur.meta.info.ContextDescriptor;
import org.apache.excalibur.meta.info.DependencyDescriptor;
import org.apache.excalibur.meta.info.EntryDescriptor;
+import org.apache.excalibur.meta.info.ExtensionDescriptor;
import org.apache.excalibur.meta.info.LoggerDescriptor;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
+import org.apache.excalibur.meta.info.ServiceDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
-import org.apache.excalibur.meta.ConfigurationBuilder;
+import org.apache.excalibur.meta.info.Type;
import org.xml.sax.InputSource;
/**
1.2 +3 -3
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/MonitorUtil.java
Index: MonitorUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/MonitorUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonitorUtil.java 7 Sep 2002 12:14:01 -0000 1.1
+++ MonitorUtil.java 2 Oct 2002 01:52:22 -0000 1.2
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.excalibur.monitor;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.Logger;
-import java.util.ArrayList;
-import java.lang.reflect.Constructor;
/**
* A class that contains a few utility methods for working
1.6 +2 -2
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/AbstractMonitor.java
Index: AbstractMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/AbstractMonitor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMonitor.java 2 Oct 2002 01:47:04 -0000 1.5
+++ AbstractMonitor.java 2 Oct 2002 01:52:22 -0000 1.6
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.excalibur.monitor.impl;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Collection;
import org.apache.avalon.excalibur.monitor.Monitor;
import org.apache.avalon.excalibur.monitor.Resource;
1.2 +3 -3
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java
Index: PassiveMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PassiveMonitor.java 7 Sep 2002 12:14:02 -0000 1.1
+++ PassiveMonitor.java 2 Oct 2002 01:52:22 -0000 1.2
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.excalibur.monitor.impl;
-import org.apache.avalon.excalibur.monitor.Resource;
-import java.util.Map;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
+import org.apache.avalon.excalibur.monitor.Resource;
/**
* A passive monitor will check the reosurce each time it
1.2 +3 -3
jakarta-avalon-excalibur/monitor/src/test/org/apache/avalon/excalibur/monitor/test/MonitorTestCaseListener.java
Index: MonitorTestCaseListener.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/test/org/apache/avalon/excalibur/monitor/test/MonitorTestCaseListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonitorTestCaseListener.java 7 Sep 2002 12:14:02 -0000 1.1
+++ MonitorTestCaseListener.java 2 Oct 2002 01:52:22 -0000 1.2
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.excalibur.monitor.test;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.excalibur.monitor.FileResource;
-import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import org.apache.avalon.excalibur.monitor.FileResource;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
class MonitorTestCaseListener
extends AbstractLogEnabled
1.3 +2 -2
jakarta-avalon-excalibur/policy/src/java/org/apache/excalibur/policy/reader/PolicyReader.java
Index: PolicyReader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/policy/src/java/org/apache/excalibur/policy/reader/PolicyReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyReader.java 2 Oct 2002 01:47:04 -0000 1.2
+++ PolicyReader.java 2 Oct 2002 01:52:23 -0000 1.3
@@ -10,8 +10,8 @@
import java.util.ArrayList;
import org.apache.excalibur.policy.metadata.GrantMetaData;
import org.apache.excalibur.policy.metadata.KeyStoreMetaData;
-import org.apache.excalibur.policy.metadata.PolicyMetaData;
import org.apache.excalibur.policy.metadata.PermissionMetaData;
+import org.apache.excalibur.policy.metadata.PolicyMetaData;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
1.3 +2 -2
jakarta-avalon-excalibur/policy/src/java/org/apache/excalibur/policy/runtime/DefaultPolicy.java
Index: DefaultPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/policy/src/java/org/apache/excalibur/policy/runtime/DefaultPolicy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultPolicy.java 2 Oct 2002 01:47:04 -0000 1.2
+++ DefaultPolicy.java 2 Oct 2002 01:52:23 -0000 1.3
@@ -7,11 +7,11 @@
*/
package org.apache.excalibur.policy.runtime;
-import java.util.Map;
-import java.util.Iterator;
import java.security.CodeSource;
import java.security.Permission;
import java.security.Permissions;
+import java.util.Iterator;
+import java.util.Map;
/**
* A policy implementation that accepts policys details from a map.
1.5 +5 -5
jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool/ResourceLimitingPool.java
Index: ResourceLimitingPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool/ResourceLimitingPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceLimitingPool.java 30 Jul 2002 14:10:54 -0000 1.4
+++ ResourceLimitingPool.java 2 Oct 2002 01:52:23 -0000 1.5
@@ -9,14 +9,14 @@
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.excalibur.instrument.CounterInstrument;
-import org.apache.excalibur.instrument.Instrument;
-import org.apache.excalibur.instrument.Instrumentable;
-import org.apache.excalibur.instrument.ValueInstrument;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.excalibur.instrument.CounterInstrument;
+import org.apache.excalibur.instrument.Instrument;
+import org.apache.excalibur.instrument.Instrumentable;
+import org.apache.excalibur.instrument.ValueInstrument;
/**
* General Pool implementation which supports; weak and strong pool size
limits,
1.3 +1 -2
jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/BasicThreadPool.java
Index: BasicThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/BasicThreadPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicThreadPool.java 2 Oct 2002 01:47:04 -0000 1.2
+++ BasicThreadPool.java 2 Oct 2002 01:52:23 -0000 1.3
@@ -8,14 +8,13 @@
package org.apache.avalon.excalibur.thread.impl;
import org.apache.avalon.excalibur.pool.ObjectFactory;
-import org.apache.avalon.excalibur.pool.SoftResourceLimitingPool;
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Executable;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.thread.ThreadControl;
import org.apache.excalibur.thread.impl.AbstractThreadPool;
import org.apache.excalibur.thread.impl.WorkerThread;
1.11 +1 -1
jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultThreadPool.java 28 Sep 2002 09:31:01 -0000 1.10
+++ DefaultThreadPool.java 2 Oct 2002 01:52:23 -0000 1.11
@@ -12,11 +12,11 @@
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Executable;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.thread.ThreadControl;
import org.apache.excalibur.threadcontext.ThreadContext;
1.9 +5 -5
jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/ResourceLimitingThreadPool.java
Index: ResourceLimitingThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/ResourceLimitingThreadPool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResourceLimitingThreadPool.java 2 Oct 2002 01:47:04 -0000 1.8
+++ ResourceLimitingThreadPool.java 2 Oct 2002 01:52:24 -0000 1.9
@@ -7,18 +7,18 @@
*/
package org.apache.avalon.excalibur.thread.impl;
-import org.apache.excalibur.instrument.Instrument;
-import org.apache.excalibur.instrument.Instrumentable;
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.pool.ResourceLimitingPool;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Executable;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.excalibur.threadcontext.ThreadContext;
+import org.apache.excalibur.instrument.Instrument;
+import org.apache.excalibur.instrument.Instrumentable;
import org.apache.excalibur.thread.ThreadControl;
+import org.apache.excalibur.threadcontext.ThreadContext;
/**
* A Thread Pool which can be configured to have a hard limit on the maximum
number of threads
1.2 +1 -1
jakarta-avalon-excalibur/thread/src/java/org/apache/excalibur/thread/impl/AbstractThreadPool.java
Index: AbstractThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/thread/src/java/org/apache/excalibur/thread/impl/AbstractThreadPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractThreadPool.java 28 Sep 2002 08:28:33 -0000 1.1
+++ AbstractThreadPool.java 2 Oct 2002 01:52:24 -0000 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.thread.impl;
+import org.apache.excalibur.thread.Executable;
import org.apache.excalibur.thread.ThreadControl;
import org.apache.excalibur.thread.ThreadPool;
-import org.apache.excalibur.thread.Executable;
/**
* This is the base class of all ThreadPools.
1.5 +2 -2
jakarta-avalon-excalibur/util/src/java/org/apache/excalibur/util/ComponentStateValidator.java
Index: ComponentStateValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/util/src/java/org/apache/excalibur/util/ComponentStateValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComponentStateValidator.java 2 Oct 2002 01:47:04 -0000 1.4
+++ ComponentStateValidator.java 2 Oct 2002 01:52:24 -0000 1.5
@@ -12,7 +12,6 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.activity.Suspendable;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Reconfigurable;
@@ -21,6 +20,7 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.service.Serviceable;
/**
* This class provides basic facilities for enforcing Avalon's contracts
1.3 +2 -2
jakarta-avalon-excalibur/util/src/test/org/apache/excalibur/util/test/FullLifecycleComponent.java
Index: FullLifecycleComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/util/src/test/org/apache/excalibur/util/test/FullLifecycleComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FullLifecycleComponent.java 2 May 2002 16:54:23 -0000 1.2
+++ FullLifecycleComponent.java 2 Oct 2002 01:52:24 -0000 1.3
@@ -7,7 +7,6 @@
*/
package org.apache.excalibur.util.test;
-import org.apache.excalibur.util.ComponentStateValidator;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
@@ -27,6 +26,7 @@
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.excalibur.util.ComponentStateValidator;
/**
* This test class is used to test the AbstractComponent facilities for you.
1.6 +3 -3
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/JaxpParser.java
Index: JaxpParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/JaxpParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JaxpParser.java 2 Oct 2002 01:47:04 -0000 1.5
+++ JaxpParser.java 2 Oct 2002 01:52:24 -0000 1.6
@@ -17,9 +17,9 @@
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.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;
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
1.7 +2 -2
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/XercesParser.java
Index: XercesParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/XercesParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesParser.java 10 Jul 2002 08:53:17 -0000 1.6
+++ XercesParser.java 2 Oct 2002 01:52:24 -0000 1.7
@@ -8,9 +8,9 @@
package org.apache.avalon.excalibur.xml;
import java.io.IOException;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.xerces.dom.DocumentImpl;
import org.apache.xerces.parsers.DOMParser;
import org.apache.xerces.parsers.SAXParser;
1.3 +2 -2
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/EmptyNodeList.java
Index: EmptyNodeList.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/EmptyNodeList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmptyNodeList.java 10 Jul 2002 08:53:17 -0000 1.2
+++ EmptyNodeList.java 2 Oct 2002 01:52:25 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.excalibur.xml.xpath;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Noop NodeList.
1.7 +5 -5
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java
Index: JaxenProcessorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JaxenProcessorImpl.java 2 Oct 2002 01:47:05 -0000 1.6
+++ JaxenProcessorImpl.java 2 Oct 2002 01:52:25 -0000 1.7
@@ -9,16 +9,16 @@
import java.util.HashMap;
import java.util.List;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.jaxen.dom.DOMXPath;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.jaxen.NamespaceContext;
+import org.jaxen.dom.DOMXPath;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jaxen.NamespaceContext;
/**
* This class defines the implementation of the [EMAIL PROTECTED]
XPathProcessor}
1.3 +3 -3
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/SimpleNodeList.java
Index: SimpleNodeList.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/SimpleNodeList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleNodeList.java 10 Jul 2002 08:53:17 -0000 1.2
+++ SimpleNodeList.java 2 Oct 2002 01:52:25 -0000 1.3
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.excalibur.xml.xpath;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
import java.util.List;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Simple node list wrapper around a List object.
1.7 +6 -6
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathProcessorImpl.java 2 Oct 2002 01:47:05 -0000 1.6
+++ XPathProcessorImpl.java 2 Oct 2002 01:52:25 -0000 1.7
@@ -9,15 +9,15 @@
import java.util.HashMap;
import javax.xml.transform.TransformerException;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.XPathAPI;
-import org.apache.xml.utils.PrefixResolver;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.xml.utils.PrefixResolver;
+import org.apache.xpath.XPathAPI;
+import org.apache.xpath.objects.XObject;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
1.17 +2 -4
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/avalon/excalibur/xml/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XSLTProcessorImpl.java 15 Aug 2002 15:54:19 -0000 1.16
+++ XSLTProcessorImpl.java 2 Oct 2002 01:52:25 -0000 1.17
@@ -27,15 +27,13 @@
import org.apache.avalon.excalibur.xml.XMLizable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
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.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
1.3 +2 -2
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DOMSerializer.java
Index: DOMSerializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DOMSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMSerializer.java 2 Oct 2002 01:47:05 -0000 1.2
+++ DOMSerializer.java 2 Oct 2002 01:52:25 -0000 1.3
@@ -9,8 +9,8 @@
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
/**
* Converts a DOM document to a stream of SAX events.
1.6 +2 -3
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMHandler.java
Index: DefaultDOMHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultDOMHandler.java 2 Oct 2002 01:47:05 -0000 1.5
+++ DefaultDOMHandler.java 2 Oct 2002 01:52:25 -0000 1.6
@@ -7,11 +7,10 @@
*/
package org.apache.excalibur.xml.dom;
-import org.xml.sax.SAXException;
-import org.w3c.dom.Document;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.TransformerHandler;
import org.apache.avalon.excalibur.xml.ContentHandlerWrapper;
+import org.w3c.dom.Document;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Mircea Toma</a>
1.6 +1 -4
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMHandlerFactory.java
Index: DefaultDOMHandlerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMHandlerFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultDOMHandlerFactory.java 2 Oct 2002 01:47:05 -0000 1.5
+++ DefaultDOMHandlerFactory.java 2 Oct 2002 01:52:25 -0000 1.6
@@ -13,9 +13,6 @@
import javax.xml.transform.sax.TransformerHandler;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
-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.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.w3c.dom.Document;
1.4 +5 -5
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMSerializer.java
Index: DefaultDOMSerializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultDOMSerializer.java 2 Oct 2002 01:47:05 -0000 1.3
+++ DefaultDOMSerializer.java 2 Oct 2002 01:52:25 -0000 1.4
@@ -7,18 +7,18 @@
*/
package org.apache.excalibur.xml.dom;
-import org.w3c.dom.Document;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXResult;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.w3c.dom.Document;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
public class DefaultDOMSerializer
extends AbstractLogEnabled
1.5 +2 -2
jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xmlizer/XMLizer.java
Index: XMLizer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xmlizer/XMLizer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLizer.java 2 Oct 2002 01:47:05 -0000 1.4
+++ XMLizer.java 2 Oct 2002 01:52:25 -0000 1.5
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.xmlizer;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.xml.sax.ContentHandler;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
