avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces Application.java Kernel.java SystemManager.java
Date Fri, 10 May 2002 11:08:57 GMT
donaldp     02/05/10 04:08:57

  Modified:    src/java/org/apache/avalon/phoenix/components/application
                        DefaultApplication.java
               src/java/org/apache/avalon/phoenix/components/classloader
                        DefaultClassLoaderManager.java
               src/java/org/apache/avalon/phoenix/components/embeddor
                        DefaultEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultKernel.java
               src/java/org/apache/avalon/phoenix/components/manager
                        AbstractSystemManager.java DefaultManager.java
                        MX4JSystemManager.java
               src/java/org/apache/avalon/phoenix/interfaces
                        Application.java Kernel.java SystemManager.java
  Log:
  Make sure that the Work interface for all the kernel components do not extend Lifecycle
interfaces as that is EVIL!
  
  Revision  Changes    Path
  1.16      +4 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
  
  Index: DefaultApplication.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultApplication.java	10 May 2002 02:43:03 -0000	1.15
  +++ DefaultApplication.java	10 May 2002 11:08:56 -0000	1.16
  @@ -13,6 +13,9 @@
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.activity.Startable;
  +import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.phoenix.ApplicationEvent;
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.interfaces.Application;
  @@ -34,7 +37,7 @@
    */
   public final class DefaultApplication
       extends AbstractLogEnabled
  -    implements Application, ApplicationMBean
  +    implements Application, ApplicationMBean, Initializable, Startable, Disposable
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( DefaultApplication.class );
  
  
  
  1.30      +1 -1      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DefaultClassLoaderManager.java	10 May 2002 09:13:41 -0000	1.29
  +++ DefaultClassLoaderManager.java	10 May 2002 11:08:56 -0000	1.30
  @@ -18,6 +18,7 @@
   import org.apache.avalon.excalibur.extension.Extension;
   import org.apache.avalon.excalibur.extension.OptionalPackage;
   import org.apache.avalon.excalibur.extension.PackageManager;
  +import org.apache.avalon.excalibur.extension.PackageRepository;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -30,7 +31,6 @@
   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;
   
   /**
    * Component that creates and manages the <code>ClassLoader</code>
  
  
  
  1.57      +1 -1      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.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- DefaultEmbeddor.java	10 May 2002 10:47:11 -0000	1.56
  +++ DefaultEmbeddor.java	10 May 2002 11:08:56 -0000	1.57
  @@ -248,7 +248,7 @@
   
       private boolean emptyKernel()
       {
  -        Kernel kernel = (Kernel)getEmbeddorComponent( Kernel.ROLE );
  +        final Kernel kernel = getKernel();
           if( null != kernel )
           {
               final String[] names = kernel.getApplicationNames();
  
  
  
  1.61      +3 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- DefaultKernel.java	10 May 2002 10:44:57 -0000	1.60
  +++ DefaultKernel.java	10 May 2002 11:08:56 -0000	1.61
  @@ -11,6 +11,8 @@
   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.activity.Initializable;
  +import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  @@ -45,7 +47,7 @@
    */
   public class DefaultKernel
       extends AbstractLogEnabled
  -    implements Kernel, KernelMBean, Serviceable
  +    implements Kernel, KernelMBean, Initializable, Serviceable, Disposable
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( DefaultKernel.class );
  
  
  
  1.10      +5 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java
  
  Index: AbstractSystemManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractSystemManager.java	10 May 2002 02:43:04 -0000	1.9
  +++ AbstractSystemManager.java	10 May 2002 11:08:57 -0000	1.10
  @@ -11,6 +11,9 @@
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.activity.Startable;
  +import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.phoenix.interfaces.ManagerException;
   import org.apache.avalon.phoenix.interfaces.SystemManager;
   
  @@ -21,7 +24,8 @@
    */
   public abstract class AbstractSystemManager
       extends AbstractLogEnabled
  -    implements SystemManager
  +    implements SystemManager, Initializable, Startable, Disposable
  +
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( AbstractSystemManager.class );
  
  
  
  1.21      +1 -1      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultManager.java	10 May 2002 09:13:41 -0000	1.20
  +++ DefaultManager.java	10 May 2002 11:08:57 -0000	1.21
  @@ -19,6 +19,7 @@
   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;
  @@ -38,7 +39,6 @@
   import org.apache.avalon.phoenix.interfaces.KernelMBean;
   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;
   
   /**
  
  
  
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MX4JSystemManager.java	10 May 2002 09:13:41 -0000	1.4
  +++ MX4JSystemManager.java	10 May 2002 11:08:57 -0000	1.5
  @@ -14,6 +14,7 @@
   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;
  @@ -32,7 +33,6 @@
   import org.apache.avalon.phoenix.interfaces.KernelMBean;
   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;
   
   /**
  
  
  
  1.8       +0 -4      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Application.java	10 May 2002 09:13:41 -0000	1.7
  +++ Application.java	10 May 2002 11:08:57 -0000	1.8
  @@ -7,9 +7,6 @@
    */
   package org.apache.avalon.phoenix.interfaces;
   
  -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.phoenix.Block;
   
   /**
  @@ -23,7 +20,6 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    */
   public interface Application
  -    extends Initializable, Startable, Disposable
   {
       String ROLE = Application.class.getName();
   
  
  
  
  1.9       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Kernel.java	10 May 2002 09:13:41 -0000	1.8
  +++ Kernel.java	10 May 2002 11:08:57 -0000	1.9
  @@ -18,7 +18,6 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    */
   public interface Kernel
  -    extends Initializable, Disposable
   {
       String ROLE = Kernel.class.getName();
   
  
  
  
  1.7       +0 -5      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SystemManager.java	10 May 2002 09:13:41 -0000	1.6
  +++ SystemManager.java	10 May 2002 11:08:57 -0000	1.7
  @@ -7,10 +7,6 @@
    */
   package org.apache.avalon.phoenix.interfaces;
   
  -import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.activity.Startable;
  -
   /**
    * This component is responsible for managing the system.
    * This includes managing the embeddor, deployer and kernel.
  @@ -19,7 +15,6 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    */
   public interface SystemManager
  -    extends Initializable, Startable, Disposable
   {
       String ROLE = SystemManager.class.getName();
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message