colus 2002/06/20 07:13:29
Modified: src/java/org/apache/avalon/phoenix/components/manager
MX4JSystemManager.java DefaultManager.java
Log:
Remove unused things.
Revision Changes Path
1.8 +0 -43
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MX4JSystemManager.java 20 Jun 2002 11:08:01 -0000 1.7
+++ MX4JSystemManager.java 20 Jun 2002 14:13:29 -0000 1.8
@@ -14,24 +14,8 @@
import javax.management.ObjectName;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.extension.PackageRepository;
-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;
-import org.apache.avalon.phoenix.interfaces.Deployer;
-import org.apache.avalon.phoenix.interfaces.DeployerMBean;
-import org.apache.avalon.phoenix.interfaces.Embeddor;
-import org.apache.avalon.phoenix.interfaces.EmbeddorMBean;
-import org.apache.avalon.phoenix.interfaces.ExtensionManagerMBean;
-import org.apache.avalon.phoenix.interfaces.Kernel;
-import org.apache.avalon.phoenix.interfaces.KernelMBean;
-import org.apache.avalon.phoenix.interfaces.LogManager;
import org.apache.avalon.phoenix.interfaces.ManagerException;
import org.apache.excalibur.baxter.JavaBeanMBean;
@@ -44,7 +28,6 @@
*/
public class MX4JSystemManager
extends AbstractSystemManager
- implements Serviceable
{
private static final Resources REZ =
ResourceManager.getPackageResources( MX4JSystemManager.class );
@@ -53,32 +36,6 @@
private MBeanServer m_mBeanServer;
private String m_domain = "Phoenix";
-
- private Embeddor m_embeddor;
- private Deployer m_deployer;
- private LogManager m_logManager;
- private Kernel m_kernel;
- private ConfigurationRepository m_repository;
- private PackageRepository m_extensionManager;
-
- /**
- * Retrieve relevant services needed to deploy.
- *
- * @param serviceManager the ComponentManager
- * @throws ServiceException if an error occurs
- */
- public void service( final ServiceManager serviceManager )
- throws ServiceException
- {
- 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()
throws Exception
1.25 +1 -38
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultManager.java 20 Jun 2002 11:08:01 -0000 1.24
+++ DefaultManager.java 20 Jun 2002 14:13:29 -0000 1.25
@@ -19,28 +19,16 @@
import javax.management.ObjectName;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.extension.PackageRepository;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
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;
-import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
-import org.apache.avalon.phoenix.interfaces.Deployer;
-import org.apache.avalon.phoenix.interfaces.DeployerMBean;
-import org.apache.avalon.phoenix.interfaces.Embeddor;
-import org.apache.avalon.phoenix.interfaces.EmbeddorMBean;
-import org.apache.avalon.phoenix.interfaces.ExtensionManagerMBean;
-import org.apache.avalon.phoenix.interfaces.Kernel;
-import org.apache.avalon.phoenix.interfaces.KernelMBean;
-import org.apache.avalon.phoenix.interfaces.LogManager;
import org.apache.avalon.phoenix.interfaces.ManagerException;
import org.apache.excalibur.baxter.JavaBeanMBean;
@@ -53,7 +41,7 @@
*/
public class DefaultManager
extends AbstractSystemManager
- implements Parameterizable, Configurable, Serviceable
+ implements Parameterizable, Configurable
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultManager.class );
@@ -77,12 +65,6 @@
private String m_domain = "Phoenix";
- private Embeddor m_embeddor;
- private Deployer m_deployer;
- private LogManager m_logManager;
- private Kernel m_kernel;
- private ConfigurationRepository m_repository;
- private PackageRepository m_extensionManager;
private Configuration m_configuration;
public void parameterize( final Parameters parameters )
@@ -97,25 +79,6 @@
m_configuration = configuration;
}
- /**
- * Retrieve relevant services needed to deploy.
- *
- * @param serviceManager the ComponentManager
- * @throws ServiceException if an error occurs
- */
- public void service( final ServiceManager serviceManager )
- throws ServiceException
- {
- 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()
throws Exception
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
