donaldp 02/05/10 02:13:42
Modified: src/java/org/apache/avalon/phoenix/components/classloader
AbstractPolicy.java DefaultClassLoaderManager.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java
src/java/org/apache/avalon/phoenix/components/embeddor
DefaultEmbeddor.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java DefaultKernel.java
src/java/org/apache/avalon/phoenix/components/manager
DefaultManager.java MX4JSystemManager.java
src/java/org/apache/avalon/phoenix/interfaces
Application.java ApplicationContext.java
ClassLoaderManager.java
ConfigurationRepository.java Deployer.java
DeploymentRecorder.java Embeddor.java Kernel.java
LogManager.java PackageRepository.java
SystemManager.java
src/java/org/apache/avalon/phoenix/tools/installer
FileDigest.java
Log:
Kernel Services no longer implement Component nor COmpsable - they get all
their services via the Servicable interface.
Revision Changes Path
1.7 +1 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/AbstractPolicy.java
Index: AbstractPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/AbstractPolicy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractPolicy.java 10 May 2002 02:43:03 -0000 1.6
+++ AbstractPolicy.java 10 May 2002 09:13:41 -0000 1.7
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import org.apache.avalon.excalibur.io.FileUtil;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
@@ -30,7 +29,7 @@
*/
abstract class AbstractPolicy
extends Policy
- implements Component, LogEnabled
+ implements LogEnabled
{
private final ArrayList m_entries = new ArrayList();
private Logger m_logger;
1.29 +11 -11
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultClassLoaderManager.java 10 May 2002 02:43:03 -0000 1.28
+++ DefaultClassLoaderManager.java 10 May 2002 09:13:41 -0000 1.29
@@ -20,15 +20,15 @@
import org.apache.avalon.excalibur.extension.PackageManager;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-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.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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.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.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.interfaces.PackageRepository;
@@ -49,7 +49,7 @@
*/
public class DefaultClassLoaderManager
extends AbstractLogEnabled
- implements ClassLoaderManager, Contextualizable, Composable
+ implements ClassLoaderManager, Contextualizable, Serviceable
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultClassLoaderManager.class
);
@@ -84,11 +84,11 @@
m_commonClassLoader = (ClassLoader)context.get( "common.classloader"
);
}
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
final PackageRepository packageRepository =
- (PackageRepository)componentManager.lookup(
PackageRepository.ROLE );
+ (PackageRepository)serviceManager.lookup( PackageRepository.ROLE
);
m_packageManager = new PackageManager( packageRepository );
}
@@ -97,7 +97,7 @@
* See Class Javadoc for description of technique for creating
* <code>ClassLoader</code>.
*
- * @param server the configuration "server.xml" for the application
+ * @param environment the configuration "environment.xml" for the
application
* @param source the source of application. (usually the name of the
.sar file
* or else the same as baseDirectory)
* @param homeDirectory the base directory of application
1.23 +15 -17
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultDeployer.java 10 May 2002 02:43:03 -0000 1.22
+++ DefaultDeployer.java 10 May 2002 09:13:41 -0000 1.23
@@ -8,17 +8,17 @@
package org.apache.avalon.phoenix.components.deployer;
import java.io.File;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
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.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
@@ -46,7 +46,7 @@
*/
public class DefaultDeployer
extends AbstractLogEnabled
- implements Deployer, Composable, Initializable, DeployerMBean
+ implements Deployer, Serviceable, Initializable, DeployerMBean
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultDeployer.class );
@@ -64,17 +64,17 @@
/**
* Retrieve relevant services needed to deploy.
*
- * @param componentManager the ComponentManager
- * @throws ComponentException if an error occurs
+ * @param serviceManager the ComponentManager
+ * @throws ServiceException if an error occurs
*/
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_kernel = (Kernel)componentManager.lookup( Kernel.ROLE );
- m_repository = (ConfigurationRepository)componentManager.lookup(
ConfigurationRepository.ROLE );
- m_classLoaderManager = (ClassLoaderManager)componentManager.lookup(
ClassLoaderManager.ROLE );
- m_logManager = (LogManager)componentManager.lookup( LogManager.ROLE
);
- m_recorder = (DeploymentRecorder)componentManager.lookup(
DeploymentRecorder.ROLE );
+ m_kernel = (Kernel)serviceManager.lookup( Kernel.ROLE );
+ m_repository = (ConfigurationRepository)serviceManager.lookup(
ConfigurationRepository.ROLE );
+ m_classLoaderManager = (ClassLoaderManager)serviceManager.lookup(
ClassLoaderManager.ROLE );
+ m_logManager = (LogManager)serviceManager.lookup( LogManager.ROLE );
+ m_recorder = (DeploymentRecorder)serviceManager.lookup(
DeploymentRecorder.ROLE );
}
public void initialize()
@@ -119,7 +119,6 @@
}
}
-
/**
* Deploy an application from an installation.
*
@@ -132,14 +131,13 @@
{
try
{
- deploy( name, new URL( sarURL ) );
+ deploy( name, new URL( sarURL ) );
}
catch( MalformedURLException mue )
{
throw new DeploymentException( mue.getMessage(), mue );
}
}
-
/**
* Deploy an application from an installation.
1.55 +22 -17
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- DefaultEmbeddor.java 10 May 2002 02:43:03 -0000 1.54
+++ DefaultEmbeddor.java 10 May 2002 09:13:41 -0000 1.55
@@ -18,10 +18,6 @@
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.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.DefaultComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -32,6 +28,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.DefaultServiceManager;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.Constants;
import org.apache.avalon.phoenix.interfaces.Deployer;
import org.apache.avalon.phoenix.interfaces.Embeddor;
@@ -415,7 +414,9 @@
{
for( int i = 0; i < m_components.length; i++ )
{
- object = createComponent( m_components[ i ].getClassName(),
Class.forName( m_components[ i ].getClassName() ) );
+ final String className = m_components[ i ].getClassName();
+ final Class clazz = Class.forName( className );
+ object = createComponent( className, clazz );
m_components[ i ].setObject( object );
}
}
@@ -488,7 +489,7 @@
{
for( int i = 0; i < m_components.length; i++ )
{
- final Component component = (Component)( m_components[ i
].getObject() );
+ final Object component = m_components[ i ].getObject();
final String loggerName = m_components[ i ].getLoggerName();
final Configuration configuration = m_components[ i
].getConfiguration();
setupComponent( component, loggerName, configuration );
@@ -502,7 +503,9 @@
* @param component the component
* @throws Exception if an error occurs
*/
- private void setupComponent( final Component component, final String
loggerName, Configuration config )
+ private void setupComponent( final Object component,
+ final String loggerName,
+ Configuration config )
throws Exception
{
setupLogger( component, loggerName );
@@ -510,10 +513,10 @@
{
( (Contextualizable)component ).contextualize( m_context );
}
- if( component instanceof Composable )
+ if( component instanceof Serviceable )
{
- final ComponentManager componentManager = getComponentManager();
- ( (Composable)component ).compose( componentManager );
+ final ServiceManager serviceManager = getServiceManager();
+ ( (Serviceable)component ).service( serviceManager );
}
if( component instanceof Parameterizable )
{
@@ -539,7 +542,7 @@
for( int i = 0; i < m_components.length; i++ )
{
final EmbeddorEntry entry = m_components[ i ];
- shutdownComponent( (Component)entry.getObject() );
+ shutdownComponent( entry.getObject() );
}
}
@@ -550,7 +553,7 @@
* @param component the component
* @throws Exception if an error occurs
*/
- private void shutdownComponent( final Component component )
+ private void shutdownComponent( final Object component )
throws Exception
{
if( null == component ) return;
@@ -602,15 +605,17 @@
}
}
- private ComponentManager getComponentManager()
+ private ServiceManager getServiceManager()
{
- final DefaultComponentManager componentManager = new
DefaultComponentManager();
- componentManager.put( Embeddor.ROLE, this );
+ final DefaultServiceManager serviceManager = new
DefaultServiceManager();
+ serviceManager.put( Embeddor.ROLE, this );
for( int i = 0; i < m_components.length; i++ )
{
- componentManager.put( m_components[ i ].getRole(),
(Component)getEmbeddorComponent( m_components[ i ].getRole() ) );
+ final String role = m_components[ i ].getRole();
+ final Object component = getEmbeddorComponent( role );
+ serviceManager.put( role, component );
}
- return componentManager;
+ return serviceManager;
}
/**
1.14 +12 -13
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultApplicationContext.java 10 May 2002 02:43:03 -0000 1.13
+++ DefaultApplicationContext.java 10 May 2002 09:13:41 -0000 1.14
@@ -10,22 +10,21 @@
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
-import org.apache.excalibur.threadcontext.ThreadContext;
-import org.apache.excalibur.threadcontext.ThreadContextPolicy;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.excalibur.thread.impl.DefaultThreadPool;
-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.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.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.interfaces.SystemManager;
import org.apache.avalon.phoenix.metadata.SarMetaData;
+import org.apache.excalibur.threadcontext.ThreadContext;
+import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
@@ -36,7 +35,7 @@
*/
class DefaultApplicationContext
extends AbstractLogEnabled
- implements ApplicationContext, Composable, Configurable
+ implements ApplicationContext, Serviceable, Configurable
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultApplicationContext.class
);
@@ -75,11 +74,11 @@
m_threadContext = new ThreadContext( policy, map );
}
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_repository = (ConfigurationRepository)componentManager.lookup(
ConfigurationRepository.ROLE );
- m_systemManager = (SystemManager)componentManager.lookup(
SystemManager.ROLE );
+ m_repository = (ConfigurationRepository)serviceManager.lookup(
ConfigurationRepository.ROLE );
+ m_systemManager = (SystemManager)serviceManager.lookup(
SystemManager.ROLE );
}
/**
@@ -146,7 +145,7 @@
* and using the specified name.
*
* @param name the name of object to export
- * @param interfaceClass the interface of object with which to export
+ * @param service the interface of object with which to export
* @param object the actual object to export
*/
public void exportObject( final String name,
@@ -162,7 +161,7 @@
* Unexport specified object from management system.
*
* @param name the name of object to unexport
- * @param interfaceClass the interface of object with which to unexport
+ * @param service the interface of object with which to unexport
*/
public void unexportObject( final String name, final Class service )
throws Exception
1.59 +13 -13
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- DefaultKernel.java 10 May 2002 02:43:03 -0000 1.58
+++ DefaultKernel.java 10 May 2002 09:13:41 -0000 1.59
@@ -11,12 +11,12 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.CascadingException;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.DefaultComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.DefaultServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.components.application.DefaultApplication;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
@@ -43,7 +43,7 @@
*/
public class DefaultKernel
extends AbstractLogEnabled
- implements Kernel, KernelMBean, Composable
+ implements Kernel, KernelMBean, Serviceable
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultKernel.class );
@@ -56,11 +56,11 @@
private HashMap m_entrys = new HashMap();
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_systemManager = (SystemManager)componentManager.lookup(
SystemManager.ROLE );
- m_repository = (ConfigurationRepository)componentManager.lookup(
ConfigurationRepository.ROLE );
+ m_systemManager = (SystemManager)serviceManager.lookup(
SystemManager.ROLE );
+ m_repository = (ConfigurationRepository)serviceManager.lookup(
ConfigurationRepository.ROLE );
}
public void initialize()
@@ -206,15 +206,15 @@
setupLogger( context, entry.getMetaData().getName() + ".frame" );
- final ComponentManager componentManager =
createComponentManager();
- ( (Composable)context ).compose( componentManager );
+ final ServiceManager serviceManager = createServiceManager();
+ ( (Serviceable)context ).service( serviceManager );
context.configure( entry.getConfiguration() );
return context;
}
- private ComponentManager createComponentManager()
+ private ServiceManager createServiceManager()
{
- final DefaultComponentManager componentManager = new
DefaultComponentManager();
+ final DefaultServiceManager componentManager = new
DefaultServiceManager();
componentManager.put( SystemManager.ROLE, m_systemManager );
componentManager.put( ConfigurationRepository.ROLE, m_repository );
componentManager.makeReadOnly();
1.20 +16 -16
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/DefaultManager.java
Index: DefaultManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/DefaultManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultManager.java 10 May 2002 02:43:04 -0000 1.19
+++ DefaultManager.java 10 May 2002 09:13:41 -0000 1.20
@@ -15,17 +15,16 @@
import java.rmi.server.RemoteObject;
import java.rmi.server.UnicastRemoteObject;
import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
-import org.apache.excalibur.baxter.JavaBeanMBean;
+import javax.management.ObjectName;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.components.kernel.DefaultKernel;
import org.apache.avalon.phoenix.components.kernel.DefaultKernelMBean;
import
org.apache.avalon.phoenix.components.manager.rmiadaptor.RMIAdaptorImpl;
@@ -40,6 +39,7 @@
import org.apache.avalon.phoenix.interfaces.LogManager;
import org.apache.avalon.phoenix.interfaces.ManagerException;
import org.apache.avalon.phoenix.interfaces.PackageRepository;
+import org.apache.excalibur.baxter.JavaBeanMBean;
/**
* This component is responsible for managing phoenix instance.
@@ -50,7 +50,7 @@
*/
public class DefaultManager
extends AbstractSystemManager
- implements Parameterizable, Composable
+ implements Parameterizable, Serviceable
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultManager.class );
@@ -90,18 +90,18 @@
/**
* Retrieve relevant services needed to deploy.
*
- * @param componentManager the ComponentManager
- * @throws ComponentException if an error occurs
+ * @param serviceManager the ComponentManager
+ * @throws ServiceException if an error occurs
*/
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_embeddor = (Embeddor)componentManager.lookup( Embeddor.ROLE );
- m_kernel = (Kernel)componentManager.lookup( Kernel.ROLE );
- m_deployer = (Deployer)componentManager.lookup( Deployer.ROLE );
- m_repository = (ConfigurationRepository)componentManager.lookup(
ConfigurationRepository.ROLE );
- m_logManager = (LogManager)componentManager.lookup( LogManager.ROLE
);
- m_extensionManager = (PackageRepository)componentManager.lookup(
PackageRepository.ROLE );
+ m_embeddor = (Embeddor)serviceManager.lookup( Embeddor.ROLE );
+ m_kernel = (Kernel)serviceManager.lookup( Kernel.ROLE );
+ m_deployer = (Deployer)serviceManager.lookup( Deployer.ROLE );
+ m_repository = (ConfigurationRepository)serviceManager.lookup(
ConfigurationRepository.ROLE );
+ m_logManager = (LogManager)serviceManager.lookup( LogManager.ROLE );
+ m_extensionManager = (PackageRepository)serviceManager.lookup(
PackageRepository.ROLE );
}
public void initialize()
1.4 +26 -26
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
Index: MX4JSystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MX4JSystemManager.java 10 May 2002 02:43:04 -0000 1.3
+++ MX4JSystemManager.java 10 May 2002 09:13:41 -0000 1.4
@@ -14,12 +14,12 @@
import javax.management.ObjectName;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.components.kernel.DefaultKernel;
import org.apache.avalon.phoenix.components.kernel.DefaultKernelMBean;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
@@ -44,7 +44,7 @@
*/
public class MX4JSystemManager
extends AbstractSystemManager
- implements Parameterizable, Composable
+ implements Parameterizable, Serviceable
{
private static final Resources REZ =
ResourceManager.getPackageResources( MX4JSystemManager.class );
@@ -70,18 +70,18 @@
/**
* Retrieve relevant services needed to deploy.
*
- * @param componentManager the ComponentManager
- * @throws ComponentException if an error occurs
+ * @param serviceManager the ComponentManager
+ * @throws ServiceException if an error occurs
*/
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_embeddor = (Embeddor)componentManager.lookup( Embeddor.ROLE );
- m_kernel = (Kernel)componentManager.lookup( Kernel.ROLE );
- m_deployer = (Deployer)componentManager.lookup( Deployer.ROLE );
- m_repository = (ConfigurationRepository)componentManager.lookup(
ConfigurationRepository.ROLE );
- m_logManager = (LogManager)componentManager.lookup( LogManager.ROLE
);
- m_extensionManager = (PackageRepository)componentManager.lookup(
PackageRepository.ROLE );
+ m_embeddor = (Embeddor)serviceManager.lookup( Embeddor.ROLE );
+ m_kernel = (Kernel)serviceManager.lookup( Kernel.ROLE );
+ m_deployer = (Deployer)serviceManager.lookup( Deployer.ROLE );
+ m_repository = (ConfigurationRepository)serviceManager.lookup(
ConfigurationRepository.ROLE );
+ m_logManager = (LogManager)serviceManager.lookup( LogManager.ROLE );
+ m_extensionManager = (PackageRepository)serviceManager.lookup(
PackageRepository.ROLE );
}
public void initialize()
@@ -103,19 +103,19 @@
ObjectName processorName = new ObjectName( "Http:name=XSLTProcessor"
);
m_mBeanServer.createMBean( "mx4j.adaptor.http.XSLTProcessor",
processorName, null );
-/*
- if( path != null )
- {
- m_mBeanServer.setAttribute( processorName, new Attribute(
"File", path ) );
- }
-*/
+ /*
+ if( path != null )
+ {
+ m_mBeanServer.setAttribute( processorName, new
Attribute( "File", path ) );
+ }
+ */
m_mBeanServer.setAttribute( processorName, new Attribute(
"UseCache", new Boolean( false ) ) );
-/*
- if( pathInJar != null )
- {
- m_mBeanServer.setAttribute( processorName, new Attribute(
"PathInJar", pathInJar ) );
- }
-*/
+ /*
+ if( pathInJar != null )
+ {
+ m_mBeanServer.setAttribute( processorName, new
Attribute( "PathInJar", pathInJar ) );
+ }
+ */
m_mBeanServer.setAttribute( adaptorName, new Attribute(
"ProcessorName", processorName ) );
1.7 +1 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Application.java
Index: Application.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Application.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Application.java 17 Feb 2002 11:15:28 -0000 1.6
+++ Application.java 10 May 2002 09:13:41 -0000 1.7
@@ -10,7 +10,6 @@
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.component.Component;
import org.apache.avalon.phoenix.Block;
/**
@@ -24,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Application
- extends Component, Initializable, Startable, Disposable
+ extends Initializable, Startable, Disposable
{
String ROLE = Application.class.getName();
1.9 +1 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationContext.java 10 May 2002 02:43:04 -0000 1.8
+++ ApplicationContext.java 10 May 2002 09:13:41 -0000 1.9
@@ -7,12 +7,11 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.avalon.excalibur.thread.ThreadPool;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.phoenix.metadata.SarMetaData;
+import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.log.Logger;
/**
@@ -21,7 +20,6 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface ApplicationContext
- extends Component
{
String ROLE = ApplicationContext.class.getName();
1.10 +0 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ClassLoaderManager.java
Index: ClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ClassLoaderManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ClassLoaderManager.java 10 May 2002 02:43:04 -0000 1.9
+++ ClassLoaderManager.java 10 May 2002 09:13:41 -0000 1.10
@@ -8,7 +8,6 @@
package org.apache.avalon.phoenix.interfaces;
import java.io.File;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
/**
@@ -21,7 +20,6 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface ClassLoaderManager
- extends Component
{
String ROLE = ClassLoaderManager.class.getName();
1.8 +0 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationRepository.java
Index: ConfigurationRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationRepository.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurationRepository.java 17 Feb 2002 11:15:28 -0000 1.7
+++ ConfigurationRepository.java 10 May 2002 09:13:41 -0000 1.8
@@ -7,7 +7,6 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -17,7 +16,6 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface ConfigurationRepository
- extends Component
{
String ROLE = ConfigurationRepository.class.getName();
1.8 +0 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Deployer.java
Index: Deployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Deployer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Deployer.java 10 May 2002 02:43:04 -0000 1.7
+++ Deployer.java 10 May 2002 09:13:41 -0000 1.8
@@ -8,7 +8,6 @@
package org.apache.avalon.phoenix.interfaces;
import java.net.URL;
-import org.apache.avalon.framework.component.Component;
/**
* A Deployer is responsible for taking a URL (ie a jar/war/ear) and
deploying
@@ -21,7 +20,6 @@
* @see DeployerMBean
*/
public interface Deployer
- extends Component
{
String ROLE = Deployer.class.getName();
1.5 +0 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/DeploymentRecorder.java
Index: DeploymentRecorder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/DeploymentRecorder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeploymentRecorder.java 17 Feb 2002 11:15:28 -0000 1.4
+++ DeploymentRecorder.java 10 May 2002 09:13:41 -0000 1.5
@@ -7,7 +7,6 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.phoenix.tools.installer.Installation;
/**
@@ -16,7 +15,6 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Mircea Toma</a>
*/
public interface DeploymentRecorder
- extends Component
{
String ROLE = DeploymentRecorder.class.getName();
1.6 +1 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Embeddor.java
Index: Embeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Embeddor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Embeddor.java 17 Feb 2002 11:15:28 -0000 1.5
+++ Embeddor.java 10 May 2002 09:13:41 -0000 1.6
@@ -10,7 +10,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
/**
* This is the object that is interacted with to create, manage and
@@ -20,7 +19,7 @@
* @author <a href="[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Embeddor
- extends Component, Initializable, Executable, Disposable
+ extends Initializable, Executable, Disposable
{
String ROLE = Embeddor.class.getName();
1.8 +1 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java
Index: Kernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Kernel.java 17 Feb 2002 11:15:28 -0000 1.7
+++ Kernel.java 10 May 2002 09:13:41 -0000 1.8
@@ -9,7 +9,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.log.Hierarchy;
@@ -19,7 +18,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Kernel
- extends Component, Initializable, Disposable
+ extends Initializable, Disposable
{
String ROLE = Kernel.class.getName();
1.6 +0 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/LogManager.java
Index: LogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/LogManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LogManager.java 17 Feb 2002 11:15:28 -0000 1.5
+++ LogManager.java 10 May 2002 09:13:41 -0000 1.6
@@ -18,7 +18,6 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface LogManager
- extends Component
{
String ROLE = LogManager.class.getName();
1.7 +2 -4
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/PackageRepository.java
Index: PackageRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/PackageRepository.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PackageRepository.java 17 Feb 2002 11:15:28 -0000 1.6
+++ PackageRepository.java 10 May 2002 09:13:41 -0000 1.7
@@ -7,16 +7,14 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.avalon.framework.component.Component;
-
/**
* PackageRepository
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/02/17 11:15:28 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/10 09:13:41 $
*/
public interface PackageRepository
- extends org.apache.avalon.excalibur.extension.PackageRepository,
Component
+ extends org.apache.avalon.excalibur.extension.PackageRepository
{
String ROLE = PackageRepository.class.getName();
}
1.6 +1 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/SystemManager.java
Index: SystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/SystemManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SystemManager.java 10 May 2002 02:43:04 -0000 1.5
+++ SystemManager.java 10 May 2002 09:13:41 -0000 1.6
@@ -10,7 +10,6 @@
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.component.Component;
/**
* This component is responsible for managing the system.
@@ -20,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface SystemManager
- extends Component, Initializable, Startable, Disposable
+ extends Initializable, Startable, Disposable
{
String ROLE = SystemManager.class.getName();
1.7 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/FileDigest.java
Index: FileDigest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/FileDigest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileDigest.java 26 Feb 2002 11:13:03 -0000 1.6
+++ FileDigest.java 10 May 2002 09:13:42 -0000 1.7
@@ -6,7 +6,7 @@
* FileDigest holds file deployment information. Information
* used to verify if file was modified since deployment.
*
- * @version $Revision: 1.6 $ $Date: 2002/02/26 11:13:03 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/10 09:13:42 $
*/
public class FileDigest
{
@@ -15,8 +15,8 @@
/** Create a new FileDigest object.
*
- * @param the file.
- * @param the checksum value of the file.
+ * @param file the file.
+ * @param checksum the checksum value of the file.
*/
public FileDigest( final File file, final long checksum )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
