donaldp 01/04/18 19:16:04
Modified: lib avalonapi.jar
src/java/org/apache/phoenix AbstractBlock.java Block.java
BlockContext.java
src/java/org/apache/phoenix/engine DefaultSarDeployer.java
DefaultServerApplication.java Main.java
PhoenixEmbeddor.java PhoenixKernel.java
ServerApplicationEntry.java
src/java/org/apache/phoenix/engine/blocks BlockDAG.java
BlockEntry.java BlockVisitor.java
DefaultBlockContext.java DefaultBlockDeployer.java
src/java/org/apache/phoenix/engine/facilities
ConfigurationRepository.java ThreadManager.java
src/java/org/apache/phoenix/engine/facilities/classloader
DefaultClassLoaderManager.java SarClassLoader.java
src/java/org/apache/phoenix/engine/facilities/log
AvalonLogFormatter.java DefaultLogManager.java
src/java/org/apache/phoenix/engine/facilities/policy
AbstractPolicy.java DefaultPolicy.java
DefaultPolicyManager.java
src/java/org/apache/phoenix/engine/facilities/thread
DefaultThreadManager.java
src/java/org/apache/phoenix/engine/listeners
DefaultContainerListener.java
src/java/org/apache/phoenix/engine/phases Phase.java
ShutdownPhase.java StartupPhase.java
Log:
Update to latest avalonapi.
Revision Changes Path
1.16 +436 -429 jakarta-avalon-phoenix/lib/avalonapi.jar
<<Binary file>>
1.2 +11 -11
jakarta-avalon-phoenix/src/java/org/apache/phoenix/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/AbstractBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractBlock.java 2001/02/24 04:30:59 1.1
+++ AbstractBlock.java 2001/04/19 02:16:00 1.2
@@ -7,17 +7,17 @@
*/
package org.apache.phoenix;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
+import org.apache.avalon.Disposable;
+import org.apache.avalon.Initializable;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Disposable;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* This is an <code>AbstractBlock</code> that makes deployment a bit
@@ -25,11 +25,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/02/24 04:30:59 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/04/19 02:16:00 $
*/
public abstract class AbstractBlock
extends AbstractLoggable
- implements Block, Contextualizable, Composer, Configurable
+ implements Block, Contextualizable, Composable, Configurable
{
protected BlockContext m_context;
protected Configuration m_configuration;
@@ -47,7 +47,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_componentManager = componentManager;
}
1.2 +1 -1 jakarta-avalon-phoenix/src/java/org/apache/phoenix/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/Block.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Block.java 2001/02/24 04:30:59 1.1
+++ Block.java 2001/04/19 02:16:00 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.phoenix;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* The main interface to implement for building servers using Avalon patterns.
1.5 +10 -10
jakarta-avalon-phoenix/src/java/org/apache/phoenix/BlockContext.java
Index: BlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/BlockContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BlockContext.java 2001/04/17 03:09:44 1.4
+++ BlockContext.java 2001/04/19 02:16:00 1.5
@@ -1,20 +1,20 @@
-/*
- * 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 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 file.
*/
package org.apache.phoenix;
import java.io.File;
-import org.apache.avalon.Context;
+import org.apache.avalon.context.Context;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.log.Logger;
/**
* Context via which Blocks communicate with container.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface BlockContext
@@ -40,7 +40,7 @@
/**
* Retrieve thread pool by category.
- * ThreadPools are given names so that you can manage different thread
+ * ThreadPools are given names so that you can manage different thread
* count to different components.
*
* @param category the category
@@ -50,7 +50,7 @@
/**
* Retrieve default thread pool.
- * Equivelent to getThreadPool( "default" );
+ * Equivelent to getThreadPool( "default" );
*
* @return the default ThreadPool
*/
1.11 +18 -18
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultSarDeployer.java
Index: DefaultSarDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultSarDeployer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultSarDeployer.java 2001/04/17 03:09:45 1.10
+++ DefaultSarDeployer.java 2001/04/19 02:16:00 1.11
@@ -19,29 +19,29 @@
import java.util.Iterator;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Composer;
-import org.apache.avalon.DefaultComponentManager;
-import org.apache.avalon.DefaultContext;
import org.apache.avalon.atlantis.Application;
import org.apache.avalon.atlantis.Kernel;
import org.apache.avalon.camelot.AbstractDeployer;
import org.apache.avalon.camelot.CamelotUtil;
import org.apache.avalon.camelot.Container;
-import org.apache.avalon.camelot.Info;
import org.apache.avalon.camelot.ContainerException;
import org.apache.avalon.camelot.DefaultRegistry;
import org.apache.avalon.camelot.Deployer;
import org.apache.avalon.camelot.DeployerUtil;
import org.apache.avalon.camelot.DeploymentException;
+import org.apache.avalon.camelot.Info;
import org.apache.avalon.camelot.Locator;
import org.apache.avalon.camelot.Registry;
import org.apache.avalon.camelot.RegistryException;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.DefaultComponentManager;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.context.DefaultContext;
import org.apache.excalibur.io.FileUtil;
import org.apache.excalibur.io.IOUtil;
import org.apache.phoenix.BlockContext;
@@ -57,7 +57,7 @@
*/
public class DefaultSarDeployer
extends AbstractDeployer
- implements Composer
+ implements Composable
{
protected File m_deployDirectory;
protected Container m_container;
@@ -75,10 +75,10 @@
* Retrieve relevent services needed to deploy.
*
* @param componentManager the ComponentManager
- * @exception ComponentManagerException if an error occurs
+ * @exception ComponentException if an error occurs
*/
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_container = (Container)componentManager.
lookup( "org.apache.avalon.camelot.Container" );
@@ -246,7 +246,7 @@
final Configuration[] blocks = configuration.getChildren( "block" );
handleBlocks( application, entry, blocks, registry );
}
- catch( final ComponentManagerException cme )
+ catch( final ComponentException cme )
{
throw new DeploymentException( "Error setting up registries", cme );
}
@@ -259,9 +259,9 @@
protected void addEntry( final String name, final ServerApplicationEntry entry )
throws DeploymentException
{
- try
- {
- m_container.add( name, entry );
+ try
+ {
+ m_container.add( name, entry );
}
catch( final ContainerException ce )
{
@@ -291,14 +291,14 @@
final Deployer deployer = new DefaultBlockDeployer();
setupLogger( deployer );
- if( deployer instanceof Composer )
+ if( deployer instanceof Composable )
{
final DefaultComponentManager componentManager = new
DefaultComponentManager();
componentManager.put( "org.apache.avalon.camelot.Registry", registry );
try
{
- ((Composer)deployer).compose( componentManager );
+ ((Composable)deployer).compose( componentManager );
}
catch( final Exception e )
{
@@ -311,9 +311,9 @@
protected void handleBlocks( final Application application,
final ServerApplicationEntry saEntry,
- final Configuration[] blocks,
+ final Configuration[] blocks,
final Registry registry )
- throws ComponentManagerException, ConfigurationException,
DeploymentException
+ throws ComponentException, ConfigurationException, DeploymentException
{
for( int i = 0; i < blocks.length; i++ )
{
1.18 +11 -11
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java
Index: DefaultServerApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultServerApplication.java 2001/04/16 08:00:48 1.17
+++ DefaultServerApplication.java 2001/04/19 02:16:00 1.18
@@ -9,23 +9,23 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.DefaultComponentManager;
-import org.apache.avalon.DefaultContext;
import org.apache.avalon.Initializable;
import org.apache.avalon.atlantis.Application;
import org.apache.avalon.atlantis.ApplicationException;
import org.apache.avalon.camelot.AbstractContainer;
import org.apache.avalon.camelot.ContainerException;
import org.apache.avalon.camelot.Entry;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.DefaultComponentManager;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.DefaultContext;
import org.apache.phoenix.engine.blocks.BlockDAG;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.engine.blocks.BlockVisitor;
@@ -233,9 +233,9 @@
((Contextualizable)object).contextualize( m_context );
}
- if( object instanceof Composer )
+ if( object instanceof Composable )
{
- ((Composer)object).compose( m_componentManager );
+ ((Composable)object).compose( m_componentManager );
}
if( object instanceof Configurable )
@@ -334,7 +334,7 @@
m_threadManager );
componentManager.put(
"org.apache.phoenix.engine.facilities.ConfigurationRepository",
m_configurationRepository );
- componentManager.put( "org.apache.phoenix.engine.facilities.LogManager",
+ componentManager.put( "org.apache.phoenix.engine.facilities.LogManager",
m_logManager );
return componentManager;
1.8 +25 -25
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/Main.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Main.java 2001/04/12 05:32:54 1.7
+++ Main.java 2001/04/19 02:16:00 1.8
@@ -11,22 +11,22 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.List;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.util.cli.CLArgsParser;
-import org.apache.avalon.util.cli.CLOption;
-import org.apache.avalon.util.cli.CLOptionDescriptor;
-import org.apache.avalon.util.cli.CLUtil;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.excalibur.cli.CLArgsParser;
+import org.apache.excalibur.cli.CLOption;
+import org.apache.excalibur.cli.CLOptionDescriptor;
+import org.apache.excalibur.cli.CLUtil;
import org.apache.log.LogKit;
import org.apache.log.Priority;
/**
* The class to load the kernel and start it running.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class Main
{
- private static final String PHOENIX_HOME =
+ private static final String PHOENIX_HOME =
System.getProperty( "phoenix.home", ".." );
private static final String DEFAULT_LOG_FILE = PHOENIX_HOME +
"/logs/phoenix.log";
@@ -51,7 +51,7 @@
* @param args[] the command line arguments
*/
public void main( final String args[] )
- {
+ {
final Main main = new Main();
try { main.execute( args ); }
@@ -111,7 +111,7 @@
new CLOptionDescriptor( "debug-init",
CLOptionDescriptor.ARGUMENT_DISALLOWED,
DEBUG_LOG_OPT,
- "use this option to specify enable debug " +
+ "use this option to specify enable debug " +
"initialisation logs." );
return options;
}
@@ -127,8 +127,8 @@
{
m_options = createCLOptions();
final CLArgsParser parser = new CLArgsParser( args, m_options );
-
- if( null != parser.getErrorString() )
+
+ if( null != parser.getErrorString() )
{
System.err.println( "Error: " + parser.getErrorString() );
return;
@@ -138,17 +138,17 @@
final int size = clOptions.size();
boolean debugLog = false;
- for( int i = 0; i < size; i++ )
+ for( int i = 0; i < size; i++ )
{
final CLOption option = (CLOption)clOptions.get( i );
-
+
switch( option.getId() )
{
- case 0:
+ case 0:
System.err.println( "Error: Unknown argument" +
option.getArgument() );
//fall threw
- case HELP_OPT:
- usage();
+ case HELP_OPT:
+ usage();
return;
case DEBUG_LOG_OPT: debugLog = true; break;
@@ -156,29 +156,29 @@
case APPS_PATH_OPT: m_appsPath = option.getArgument(); break;
}
}
-
+
if( !debugLog ) LogKit.setGlobalPriority( Priority.DEBUG );
try
{
- final PrivilegedExceptionAction action = new
PrivilegedExceptionAction()
+ final PrivilegedExceptionAction action = new PrivilegedExceptionAction()
{
public Object run() throws Exception
- {
+ {
execute();
return null;
}
};
AccessController.doPrivileged( action );
- }
+ }
catch( final PrivilegedActionException pae )
{
// only "checked" exceptions will be "wrapped" in a
PrivilegedActionException.
throw pae.getException();
}
}
-
+
/**
* Actually create and execute the main component of kernel.
*
@@ -193,14 +193,14 @@
parameters.setParameter( "kernel-configuration-source", null );
parameters.setParameter( "log-destination", m_logFile );
parameters.setParameter( "applications-directory", m_appsPath );
-
+
final PhoenixEmbeddor embeddor = new PhoenixEmbeddor();
embeddor.setParameters( parameters );
embeddor.init();
- try
- {
- embeddor.execute();
+ try
+ {
+ embeddor.execute();
}
finally
{
1.4 +13 -14
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/PhoenixEmbeddor.java
Index: PhoenixEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/PhoenixEmbeddor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PhoenixEmbeddor.java 2001/04/16 08:43:04 1.3
+++ PhoenixEmbeddor.java 2001/04/19 02:16:00 1.4
@@ -9,36 +9,35 @@
import java.io.File;
import java.lang.UnsupportedOperationException;
-import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.CascadingException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.DefaultComponentManager;
import org.apache.avalon.Disposable;
import org.apache.avalon.Initializable;
-import org.apache.avalon.atlantis.Kernel;
import org.apache.avalon.atlantis.Embeddor;
+import org.apache.avalon.atlantis.Kernel;
import org.apache.avalon.camelot.CamelotUtil;
import org.apache.avalon.camelot.Container;
import org.apache.avalon.camelot.Deployer;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.DefaultComponentManager;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.phoenix.engine.facilities.log.AvalonLogFormatter;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.parameters.ParameterException;
+import org.apache.avalon.parameters.Parameters;
import org.apache.log.LogKit;
import org.apache.log.LogTarget;
import org.apache.log.Logger;
import org.apache.log.Priority;
import org.apache.log.output.FileOutputLogTarget;
+import org.apache.phoenix.engine.facilities.log.AvalonLogFormatter;
/**
* This is the object that is interacted with to create, manage and
* dispose of the kernel and related resources.
*
- * Note that this will eventually be moved to atlantis package.
- *
* @author <a href="[EMAIL PROTECTED]">Leo Simons</a>
* @author <a href="[EMAIL PROTECTED]">Peter Donald</a>
*/
@@ -82,8 +81,8 @@
* @param parameters the Parameters for embeddor
* @exception ConfigurationException if an error occurs
*/
- public void setParameters( final Parameters parameters )
- throws ConfigurationException
+ public void parametize( final Parameters parameters )
+ throws ParameterException
{
m_parameters = parameters;
}
@@ -288,7 +287,7 @@
/**
* Sets up the Deployer. If it is Loggable, it gets a reference
* to the Embeddor's logger. If it is Contextualizable it is
- * passed a Context. If it is a Composer it is given a
+ * passed a Context. If it is a Composable it is given a
* ComponentManager which references the Kernel, cast to a
* Container.
* The deployer is now used to load the applications from the
@@ -300,11 +299,11 @@
{
setupLogger( m_deployer );
- if( m_deployer instanceof Composer )
+ if( m_deployer instanceof Composable )
{
final DefaultComponentManager componentManager = new
DefaultComponentManager();
componentManager.put( "org.apache.avalon.camelot.Container",
(Container)m_kernel );
- ((Composer)m_deployer).compose( componentManager );
+ ((Composable)m_deployer).compose( componentManager );
}
}
1.5 +5 -5
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/PhoenixKernel.java
Index: PhoenixKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/PhoenixKernel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PhoenixKernel.java 2001/04/15 13:29:03 1.4
+++ PhoenixKernel.java 2001/04/19 02:16:00 1.5
@@ -7,14 +7,14 @@
*/
package org.apache.phoenix.engine;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.atlantis.AbstractKernel;
import org.apache.avalon.atlantis.Application;
import org.apache.avalon.atlantis.Kernel;
import org.apache.avalon.camelot.ContainerException;
import org.apache.avalon.camelot.Entry;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.context.Contextualizable;
import org.apache.log.LogKit;
/**
@@ -89,10 +89,10 @@
{
((Contextualizable)application).contextualize( saEntry.getContext()
);
}
-
- if( application instanceof Composer )
+
+ if( application instanceof Composable )
{
- ((Composer)application).compose( saEntry.getComponentManager() );
+ ((Composable)application).compose( saEntry.getComponentManager() );
}
if( application instanceof Configurable )
1.2 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/ServerApplicationEntry.java
Index: ServerApplicationEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/ServerApplicationEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerApplicationEntry.java 2001/02/24 04:30:59 1.1
+++ ServerApplicationEntry.java 2001/04/19 02:16:00 1.2
@@ -7,10 +7,10 @@
*/
package org.apache.phoenix.engine;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Context;
import org.apache.avalon.camelot.Entry;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.context.Context;
import org.apache.log.Logger;
/**
@@ -50,12 +50,12 @@
{
return m_componentManager;
}
-
+
public void setComponentManager( final ComponentManager componentManager )
{
m_componentManager = componentManager;
}
-
+
public Configuration getConfiguration()
{
return m_configuration;
1.9 +10 -9
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockDAG.java
Index: BlockDAG.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockDAG.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BlockDAG.java 2001/04/15 05:40:52 1.8
+++ BlockDAG.java 2001/04/19 02:16:01 1.9
@@ -9,16 +9,17 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
import org.apache.avalon.camelot.Container;
import org.apache.avalon.camelot.ContainerException;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.util.Enum;
import org.apache.phoenix.Block;
import org.apache.phoenix.metainfo.DependencyDescriptor;
import org.apache.phoenix.metainfo.ServiceDescriptor;
-import org.apache.avalon.util.Enum;
/**
* This is the dependency graph for blocks.
@@ -27,7 +28,7 @@
*/
public class BlockDAG
extends AbstractLoggable
- implements Composer
+ implements Component, Composable
{
public final static Traversal FORWARD = new Traversal( "FORWARD" );
public final static Traversal REVERSE = new Traversal( "REVERSE" );
@@ -45,7 +46,7 @@
private Container m_container;
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_container = (Container)componentManager.lookup(
"org.apache.avalon.camelot.Container" );
}
@@ -53,7 +54,7 @@
public void walkGraph( final BlockVisitor visitor, final Traversal traversal )
throws Exception
{
- //temporary storage to record those
+ //temporary storage to record those
//that are already traversed
final ArrayList completed = new ArrayList();
@@ -111,7 +112,7 @@
* @param name name of BlockEntry
* @param entry the BlockEntry
*/
- private void visitReverseDependencies( final String name,
+ private void visitReverseDependencies( final String name,
final BlockVisitor visitor,
final ArrayList completed )
throws Exception
1.6 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockEntry.java
Index: BlockEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockEntry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BlockEntry.java 2001/04/15 05:40:52 1.5
+++ BlockEntry.java 2001/04/19 02:16:01 1.6
@@ -26,7 +26,7 @@
//UGLY HACK should be stored in another server Facility (ie
ConfigurationRepository)
protected Configuration m_configuration;
- public BlockEntry( final RoleEntry[] roleEntrys )
+ public BlockEntry( final RoleEntry[] roleEntrys )
{
m_roleEntrys = roleEntrys;
}
@@ -56,7 +56,7 @@
return m_roleEntrys[ i ];
}
}
-
+
return null;
}
@@ -64,7 +64,7 @@
{
return m_roleEntrys;
}
-
+
public Configuration getConfiguration()
{
return m_configuration;
1.3 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockVisitor.java
Index: BlockVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockVisitor.java 2001/04/15 02:32:13 1.2
+++ BlockVisitor.java 2001/04/19 02:16:01 1.3
@@ -8,7 +8,7 @@
package org.apache.phoenix.engine.blocks;
import org.apache.avalon.atlantis.ApplicationException;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* Visitor interface that objects implement to walk the DAG.
1.6 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultBlockContext.java 2001/04/17 03:09:47 1.5
+++ DefaultBlockContext.java 2001/04/19 02:16:01 1.6
@@ -8,8 +8,8 @@
package org.apache.phoenix.engine.blocks;
import java.io.File;
-import org.apache.avalon.Context;
-import org.apache.avalon.DefaultContext;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.DefaultContext;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.log.Logger;
import org.apache.phoenix.BlockContext;
1.5 +16 -16
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockDeployer.java
Index: DefaultBlockDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockDeployer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultBlockDeployer.java 2001/04/17 03:09:47 1.4
+++ DefaultBlockDeployer.java 2001/04/19 02:16:01 1.5
@@ -7,28 +7,28 @@
*/
package org.apache.phoenix.engine.blocks;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Iterator;
import java.util.Map;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import java.util.zip.ZipFile;
import org.apache.avalon.camelot.AbstractDeployer;
+import org.apache.avalon.camelot.DefaultLocator;
import org.apache.avalon.camelot.DeployerUtil;
import org.apache.avalon.camelot.DeploymentException;
-import org.apache.avalon.camelot.DefaultLocator;
import org.apache.avalon.camelot.Registry;
import org.apache.avalon.camelot.RegistryException;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.excalibur.io.IOUtil;
import org.apache.phoenix.metainfo.BlockInfo;
import org.apache.phoenix.metainfo.BlockInfoBuilder;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
/**
* This class deploys a .bar file into a registry.
@@ -37,11 +37,11 @@
*/
public final class DefaultBlockDeployer
extends AbstractDeployer
- implements Composer
+ implements Composable
{
private Registry m_registry;
private BlockInfoBuilder m_builder;
-
+
/**
* Default constructor.
@@ -57,10 +57,10 @@
* Retrieve relevent services needed to deploy.
*
* @param componentManager the ComponentManager
- * @exception ComponentManagerException if an error occurs
+ * @exception ComponentException if an error occurs
*/
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_registry = (Registry)componentManager.
lookup( "org.apache.avalon.camelot.Registry" );
@@ -70,7 +70,7 @@
* Deploy a file.
* Eventually this should be cached for performance reasons.
*
- * @param location the location
+ * @param location the location
* @param file the file
* @exception DeploymentException if an error occurs
*/
@@ -96,7 +96,7 @@
try { zipFile.close(); }
catch( final IOException ioe ) {}
}
- }
+ }
/**
* Create and register Infos for all blocks stored in deployment.
@@ -104,7 +104,7 @@
* @param properties the properties
* @param url the url of deployment
* @exception DeploymentException if an error occurs
- */
+ */
protected void handleBlocks( final ZipFile zipFile, final Manifest manifest,
final URL url )
throws DeploymentException
{
@@ -119,7 +119,7 @@
final Attributes attributes = manifest.getAttributes( section );
final String blockValue = attributes.getValue( "Avalon-Block" );
final boolean isBlock = Boolean.valueOf( blockValue ).booleanValue();
-
+
if( isBlock )
{
handleBlock( zipFile, section, url );
@@ -154,8 +154,8 @@
* @return the created block info
* @exception DeploymentException if an error occurs
*/
- protected BlockInfo loadBlockInfo( final ZipFile zipFile,
- final String classname,
+ protected BlockInfo loadBlockInfo( final ZipFile zipFile,
+ final String classname,
final URL url )
throws DeploymentException
{
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/ConfigurationRepository.java
Index: ConfigurationRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/ConfigurationRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationRepository.java 2001/04/14 05:51:39 1.1
+++ ConfigurationRepository.java 2001/04/19 02:16:01 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.phoenix.engine.facilities;
-import org.apache.avalon.Component;
import org.apache.avalon.camelot.Entry;
+import org.apache.avalon.component.Component;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/ThreadManager.java
Index: ThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/ThreadManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ThreadManager.java 2001/04/17 03:09:49 1.2
+++ ThreadManager.java 2001/04/19 02:16:01 1.3
@@ -23,10 +23,10 @@
*
* @param name the name of thread pool
* @return the threadpool
- * @exception IllegalArgumentException if the name of thread pool is
+ * @exception IllegalArgumentException if the name of thread pool is
* invalid or named pool does not exist
*/
- ThreadPool getThreadPool( String name )
+ ThreadPool getThreadPool( String name )
throws IllegalArgumentException;
/**
1.2 +8 -8
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultClassLoaderManager.java 2001/04/15 13:27:43 1.1
+++ DefaultClassLoaderManager.java 2001/04/19 02:16:02 1.2
@@ -8,13 +8,13 @@
package org.apache.phoenix.engine.facilities.classloader;
import java.security.Policy;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.DefaultContext;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.DefaultContext;
import org.apache.phoenix.engine.facilities.ClassLoaderManager;
/**
@@ -23,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultClassLoaderManager
- implements ClassLoaderManager, Contextualizable, Composer, Initializable
+ implements ClassLoaderManager, Contextualizable, Composable, Initializable
{
private SarClassLoader m_classLoader = new SarClassLoader();
@@ -33,7 +33,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_classLoader.compose( componentManager );
}
1.3 +13 -13
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/classloader/SarClassLoader.java
Index: SarClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/classloader/SarClassLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SarClassLoader.java 2001/04/17 03:09:50 1.2
+++ SarClassLoader.java 2001/04/19 02:16:02 1.3
@@ -1,9 +1,9 @@
-/*
- * 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 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 file.
*/
package org.apache.phoenix.engine.facilities.classloader;
@@ -11,13 +11,13 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.security.Policy;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
import org.apache.avalon.atlantis.Facility;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
import org.apache.excalibur.io.ExtensionFileFilter;
import org.apache.phoenix.engine.SarContextResources;
import org.apache.phoenix.engine.facilities.PolicyManager;
@@ -29,7 +29,7 @@
*/
public class SarClassLoader
extends PolicyClassLoader
- implements Facility, Contextualizable, Composer, Initializable
+ implements Facility, Contextualizable, Composable, Initializable
{
protected File m_baseDirectory;
@@ -44,7 +44,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
final PolicyManager policyManager = (PolicyManager)componentManager.
lookup( "org.apache.phoenix.engine.facilities.PolicyManager" );
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/log/AvalonLogFormatter.java
Index: AvalonLogFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/log/AvalonLogFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonLogFormatter.java 2001/04/16 08:01:40 1.1
+++ AvalonLogFormatter.java 2001/04/19 02:16:02 1.2
@@ -8,7 +8,7 @@
package org.apache.phoenix.engine.facilities.log;
import java.util.Date;
-import org.apache.avalon.util.StringUtil;
+import org.apache.avalon.ExceptionUtil;
import org.apache.log.format.PatternFormatter;
/**
@@ -22,7 +22,7 @@
protected String getStackTrace( final Throwable throwable, final String format )
{
if( null == throwable ) return "";
- return StringUtil.printStackTrace( throwable, 8, true );
+ return ExceptionUtil.printStackTrace( throwable, 8, true );
}
/**
1.3 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/log/DefaultLogManager.java
Index: DefaultLogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/log/DefaultLogManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLogManager.java 2001/04/16 08:01:40 1.2
+++ DefaultLogManager.java 2001/04/19 02:16:02 1.3
@@ -9,13 +9,13 @@
import java.io.File;
import java.io.IOException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.atlantis.Facility;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.log.Category;
import org.apache.log.LogKit;
import org.apache.log.LogTarget;
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/AbstractPolicy.java
Index: AbstractPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/AbstractPolicy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractPolicy.java 2001/04/17 03:09:51 1.2
+++ AbstractPolicy.java 2001/04/19 02:16:03 1.3
@@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.PropertyPermission;
-import org.apache.avalon.Component;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.Loggable;
import org.apache.excalibur.io.FileUtil;
import org.apache.log.Logger;
1.2 +3 -4
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/DefaultPolicy.java
Index: DefaultPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/DefaultPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPolicy.java 2001/04/15 12:12:39 1.1
+++ DefaultPolicy.java 2001/04/19 02:16:03 1.2
@@ -25,15 +25,14 @@
import java.util.Iterator;
import java.util.PropertyPermission;
import java.util.StringTokenizer;
-import org.apache.avalon.Component;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.DefaultContext;
import org.apache.avalon.Initializable;
import org.apache.avalon.atlantis.Facility;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.DefaultContext;
import org.apache.avalon.util.PropertyException;
import org.apache.avalon.util.PropertyUtil;
1.2 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/DefaultPolicyManager.java
Index: DefaultPolicyManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/DefaultPolicyManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPolicyManager.java 2001/04/15 12:12:39 1.1
+++ DefaultPolicyManager.java 2001/04/19 02:16:03 1.2
@@ -8,14 +8,14 @@
package org.apache.phoenix.engine.facilities.policy;
import java.security.Policy;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.DefaultContext;
import org.apache.avalon.Initializable;
-import org.apache.avalon.Loggable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.DefaultContext;
+import org.apache.avalon.logger.Loggable;
import org.apache.log.Logger;
import org.apache.phoenix.engine.facilities.PolicyManager;
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/thread/DefaultThreadManager.java
Index: DefaultThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/thread/DefaultThreadManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultThreadManager.java 2001/04/17 03:09:52 1.2
+++ DefaultThreadManager.java 2001/04/19 02:16:03 1.3
@@ -9,11 +9,11 @@
import java.util.Hashtable;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.atlantis.Facility;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.excalibur.thread.DefaultThreadPool;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.phoenix.engine.facilities.ThreadManager;
@@ -73,7 +73,7 @@
if( null == threadPool )
{
- //Should this be a ComponentNotFoundException ????
+ //Should this be a ComponentException ????
throw new IllegalArgumentException( "No such thread group " + name );
}
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/listeners/DefaultContainerListener.java
Index: DefaultContainerListener.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/listeners/DefaultContainerListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultContainerListener.java 2001/03/05 14:34:15 1.1
+++ DefaultContainerListener.java 2001/04/19 02:16:04 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.phoenix.engine.listeners;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.phoenix.engine.listeners.ContainerListener;
/**
1.5 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/Phase.java
Index: Phase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/Phase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Phase.java 2001/04/15 02:32:13 1.4
+++ Phase.java 2001/04/19 02:16:04 1.5
@@ -7,8 +7,8 @@
*/
package org.apache.phoenix.engine.phases;
-import org.apache.avalon.Component;
import org.apache.avalon.camelot.State;
+import org.apache.avalon.component.Component;
import org.apache.phoenix.engine.blocks.BlockVisitor;
/**
1.6 +7 -7
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/ShutdownPhase.java
Index: ShutdownPhase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/ShutdownPhase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ShutdownPhase.java 2001/04/17 03:09:53 1.5
+++ ShutdownPhase.java 2001/04/19 02:16:04 1.6
@@ -7,18 +7,18 @@
*/
package org.apache.phoenix.engine.phases;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
import org.apache.avalon.Disposable;
import org.apache.avalon.Stoppable;
import org.apache.avalon.atlantis.ApplicationException;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.excalibur.thread.ThreadContext;
-import org.apache.phoenix.engine.facilities.ThreadManager;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.engine.blocks.BlockVisitor;
import org.apache.phoenix.engine.facilities.ClassLoaderManager;
+import org.apache.phoenix.engine.facilities.ThreadManager;
/**
*
@@ -26,13 +26,13 @@
*/
public class ShutdownPhase
extends AbstractLoggable
- implements BlockVisitor, Composer
+ implements BlockVisitor, Composable
{
private ClassLoader m_classLoader;
private ThreadManager m_threadManager;
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
final ClassLoaderManager classLoaderManager =
(ClassLoaderManager)componentManager.
lookup( "org.apache.phoenix.engine.facilities.ClassLoaderManager" );
1.8 +13 -13
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/StartupPhase.java
Index: StartupPhase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/StartupPhase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StartupPhase.java 2001/04/17 03:09:53 1.7
+++ StartupPhase.java 2001/04/19 02:16:04 1.8
@@ -8,16 +8,7 @@
package org.apache.phoenix.engine.phases;
import java.io.File;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.DefaultComponentManager;
-import org.apache.avalon.DefaultContext;
import org.apache.avalon.Initializable;
-import org.apache.avalon.Loggable;
import org.apache.avalon.Startable;
import org.apache.avalon.atlantis.ApplicationException;
import org.apache.avalon.camelot.Container;
@@ -26,8 +17,17 @@
import org.apache.avalon.camelot.Factory;
import org.apache.avalon.camelot.SimpleFactory;
import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.DefaultComponentManager;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.DefaultContext;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.excalibur.thread.ThreadContext;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
@@ -50,7 +50,7 @@
*/
public class StartupPhase
extends AbstractLoggable
- implements BlockVisitor, Contextualizable, Composer
+ implements BlockVisitor, Contextualizable, Composable
{
private ClassLoader m_classLoader;
private ConfigurationRepository m_repository;
@@ -83,7 +83,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
final ClassLoaderManager classLoaderManager =
(ClassLoaderManager)componentManager.
lookup( "org.apache.phoenix.engine.facilities.ClassLoaderManager" );
@@ -151,12 +151,12 @@
}
//Composition stage
- if( object instanceof Composer )
+ if( object instanceof Composable )
{
getLogger().debug( "Pre-Composition Stage" );
final ComponentManager componentManager =
createComponentManager( name, entry );
- ((Composer)object).compose( componentManager );
+ ((Composable)object).compose( componentManager );
getLogger().debug( "Composition successful." );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
