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-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection AbstractService.java
Date Sat, 18 May 2002 09:50:40 GMT
donaldp     02/05/18 02:50:40

  Modified:    src/java/org/apache/avalon/cornerstone/blocks/connection
                        DefaultConnectionManager.java
               src/java/org/apache/avalon/cornerstone/blocks/datasource
                        DefaultDataSourceSelector.java
               src/java/org/apache/avalon/cornerstone/blocks/dom
                        DOMBuilderFactory.java
               src/java/org/apache/avalon/cornerstone/blocks/masterstore
                        AbstractFileRepository.java RepositoryManager.java
               src/java/org/apache/avalon/cornerstone/blocks/packet
                        DefaultPacketManager.java
               src/java/org/apache/avalon/cornerstone/blocks/rmification
                        DefaultRMIfication.java
               src/java/org/apache/avalon/cornerstone/blocks/sax
                        SAXParserFactoryImpl.java
               src/java/org/apache/avalon/cornerstone/blocks/scheduler
                        DefaultTimeScheduler.java
               src/java/org/apache/avalon/cornerstone/blocks/security
                        DefaultRoleManager.java
               src/java/org/apache/avalon/cornerstone/blocks/soapification/glue
                        Glue.java
               src/java/org/apache/avalon/cornerstone/blocks/sockets
                        DefaultSocketManager.java
               src/java/org/apache/avalon/cornerstone/blocks/threads
                        DefaultThreadManager.java
               src/java/org/apache/avalon/cornerstone/blocks/transport/authentication
                        DefaultAuthenticator.java
               src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing
                        AutoPublisher.java
               src/java/org/apache/avalon/cornerstone/blocks/transport/publishing
                        AbstractPublisher.java
               src/java/org/apache/avalon/cornerstone/blocks/transport/subscription
                        AbstractSubscriber.java
               src/java/org/apache/avalon/cornerstone/services/connection
                        AbstractService.java
  Log:
  No need to implement Block marker interface.
  
  Revision  Changes    Path
  1.17      +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java
  
  Index: DefaultConnectionManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultConnectionManager.java	12 May 2002 08:06:40 -0000	1.16
  +++ DefaultConnectionManager.java	18 May 2002 09:50:38 -0000	1.17
  @@ -18,7 +18,6 @@
   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.Block;
   
   /**
    * This is the service through which ConnectionManagement occurs.
  @@ -29,7 +28,7 @@
    */
   public class DefaultConnectionManager
       extends AbstractLogEnabled
  -    implements Block, ConnectionManager, Serviceable, Disposable
  +    implements ConnectionManager, Serviceable, Disposable
   {
       private HashMap m_connections = new HashMap();
       private ThreadManager m_threadManager;
  
  
  
  1.18      +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
  
  Index: DefaultDataSourceSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DefaultDataSourceSelector.java	12 May 2002 08:06:40 -0000	1.17
  +++ DefaultDataSourceSelector.java	18 May 2002 09:50:38 -0000	1.18
  @@ -22,7 +22,6 @@
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.LogKitLogger;
   import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.avalon.phoenix.Block;
   
   /**
    * The Default implementation for DataSourceSelector.
  @@ -50,7 +49,7 @@
    */
   public class DefaultDataSourceSelector
       extends AbstractLoggable
  -    implements DataSourceSelector, Block, Configurable, Initializable, Disposable
  +    implements DataSourceSelector, Configurable, Initializable, Disposable
   {
       private Configuration m_configuration;
       private Map m_dataSources;
  
  
  
  1.6       +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/dom/DOMBuilderFactory.java
  
  Index: DOMBuilderFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/dom/DOMBuilderFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DOMBuilderFactory.java	12 May 2002 08:06:40 -0000	1.5
  +++ DOMBuilderFactory.java	18 May 2002 09:50:38 -0000	1.6
  @@ -14,7 +14,6 @@
   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.phoenix.Block;
   
   /**
    * Block implementation of the DocumentBuilderFactory service.  That service being
  @@ -26,7 +25,7 @@
    */
   public class DOMBuilderFactory
       extends AbstractLogEnabled
  -    implements Block, Configurable, DocumentBuilderFactory
  +    implements Configurable, DocumentBuilderFactory
   {
       protected javax.xml.parsers.DocumentBuilderFactory m_documentBuilderFactory;
   
  
  
  
  1.7       +2 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java
  
  Index: AbstractFileRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractFileRepository.java	3 Apr 2002 10:12:15 -0000	1.6
  +++ AbstractFileRepository.java	18 May 2002 09:50:38 -0000	1.7
  @@ -28,7 +28,6 @@
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
   /**
  @@ -39,7 +38,7 @@
    */
   public abstract class AbstractFileRepository
       extends AbstractLogEnabled
  -    implements Block, Repository, Contextualizable, Composable, Configurable, Initializable
  +    implements Repository, Contextualizable, Composable, Configurable, Initializable
   {
       protected static final boolean DEBUG = false;
   
  @@ -115,7 +114,7 @@
           if( m_path.startsWith( "/" ) )
           {
               directory = new File ( m_path );
  -        } 
  +        }
           else
           {
               directory = new File( m_baseDirectory, m_path );
  
  
  
  1.7       +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
  
  Index: RepositoryManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RepositoryManager.java	12 May 2002 08:06:40 -0000	1.6
  +++ RepositoryManager.java	18 May 2002 09:50:38 -0000	1.7
  @@ -23,7 +23,6 @@
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.phoenix.Block;
   
   /**
    *
  @@ -33,7 +32,7 @@
    */
   public class RepositoryManager
       extends AbstractLogEnabled
  -    implements Block, Store, Contextualizable, Composable, Configurable
  +    implements Store, Contextualizable, Composable, Configurable
   {
       private static final String REPOSITORY_NAME = "Repository";
       private static long id = 0;
  
  
  
  1.12      +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java
  
  Index: DefaultPacketManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultPacketManager.java	18 May 2002 04:08:10 -0000	1.11
  +++ DefaultPacketManager.java	18 May 2002 09:50:38 -0000	1.12
  @@ -19,7 +19,6 @@
   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.Block;
   
   /**
    * This is the service through which PacketManagement occurs.
  @@ -30,7 +29,7 @@
    */
   public class DefaultPacketManager
       extends AbstractLogEnabled
  -    implements Block, PacketManager, Serviceable, Disposable
  +    implements PacketManager, Serviceable, Disposable
   {
       private HashMap m_acceptors = new HashMap();
       private ThreadManager m_threadManager;
  
  
  
  1.7       +2 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/rmification/DefaultRMIfication.java
  
  Index: DefaultRMIfication.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/rmification/DefaultRMIfication.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultRMIfication.java	12 May 2002 08:06:40 -0000	1.6
  +++ DefaultRMIfication.java	18 May 2002 09:50:39 -0000	1.7
  @@ -23,7 +23,6 @@
   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.phoenix.Block;
   
   /**
    * FIXME: INPROGRESS and NOT TESTED
  @@ -32,11 +31,11 @@
    * @phoenix:service name="org.apache.avalon.cornerstone.services.rmification.RMIfication"
    *
    * @author <a href="mailto:colus@apache.org">Eung-ju Park</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class DefaultRMIfication
       extends AbstractLogEnabled
  -    implements Configurable, Initializable, Disposable, RMIfication, Block
  +    implements Configurable, Initializable, Disposable, RMIfication
   {
       private int m_port;
       private Registry m_registry;
  
  
  
  1.5       +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sax/SAXParserFactoryImpl.java
  
  Index: SAXParserFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sax/SAXParserFactoryImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SAXParserFactoryImpl.java	12 May 2002 08:06:40 -0000	1.4
  +++ SAXParserFactoryImpl.java	18 May 2002 09:50:39 -0000	1.5
  @@ -13,7 +13,6 @@
   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.phoenix.Block;
   import org.xml.sax.SAXNotRecognizedException;
   import org.xml.sax.SAXNotSupportedException;
   
  @@ -27,7 +26,7 @@
    */
   public class SAXParserFactoryImpl
       extends AbstractLogEnabled
  -    implements Block, Configurable, SAXParserFactory
  +    implements Configurable, SAXParserFactory
   {
       protected javax.xml.parsers.SAXParserFactory m_saxParserFactory;
   
  
  
  
  1.16      +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
  
  Index: DefaultTimeScheduler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultTimeScheduler.java	18 May 2002 04:18:52 -0000	1.15
  +++ DefaultTimeScheduler.java	18 May 2002 09:50:39 -0000	1.16
  @@ -23,7 +23,6 @@
   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.Block;
   
   /**
    * Default implementation of TimeScheduler service.
  @@ -35,7 +34,7 @@
    */
   public class DefaultTimeScheduler
       extends AbstractLogEnabled
  -    implements Block, TimeScheduler, Serviceable, Initializable, Startable, Disposable,
Runnable
  +    implements TimeScheduler, Serviceable, Initializable, Startable, Disposable, Runnable
   {
       private boolean m_running;
       private Hashtable m_entries;
  
  
  
  1.6       +0 -1      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/security/DefaultRoleManager.java
  
  Index: DefaultRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/security/DefaultRoleManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultRoleManager.java	18 May 2002 04:18:52 -0000	1.5
  +++ DefaultRoleManager.java	18 May 2002 09:50:39 -0000	1.6
  @@ -10,7 +10,6 @@
   import java.security.Principal;
   import java.util.Hashtable;
   import org.apache.avalon.cornerstone.services.security.RoleManager;
  -import org.apache.avalon.phoenix.Block;
   
   /**
    * Service to manager the role mappings for principals.
  
  
  
  1.13      +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java
  
  Index: Glue.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Glue.java	12 May 2002 08:06:41 -0000	1.12
  +++ Glue.java	18 May 2002 09:50:39 -0000	1.13
  @@ -21,7 +21,6 @@
   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.phoenix.Block;
   
   /**
    * Default implementation of SOAPification service.
  @@ -45,7 +44,7 @@
    */
   public class Glue
       extends AbstractLogEnabled
  -    implements Block, SOAPification, Configurable, Startable
  +    implements SOAPification, Configurable, Startable
   {
       protected Configuration mConfiguration;
       protected int mPort;
  
  
  
  1.7       +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java
  
  Index: DefaultSocketManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultSocketManager.java	12 May 2002 08:06:41 -0000	1.6
  +++ DefaultSocketManager.java	18 May 2002 09:50:39 -0000	1.7
  @@ -20,7 +20,6 @@
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.phoenix.Block;
   
   /**
    * Implementation of SocketManager.
  @@ -32,7 +31,7 @@
    */
   public class DefaultSocketManager
       extends AbstractLogEnabled
  -    implements SocketManager, Block, Contextualizable, Configurable, Initializable
  +    implements SocketManager, Contextualizable, Configurable, Initializable
   {
       protected final HashMap m_serverSockets = new HashMap();
       protected final HashMap m_sockets = new HashMap();
  
  
  
  1.9       +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java
  
  Index: DefaultThreadManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultThreadManager.java	12 May 2002 08:06:41 -0000	1.8
  +++ DefaultThreadManager.java	18 May 2002 09:50:39 -0000	1.9
  @@ -16,7 +16,6 @@
   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.phoenix.Block;
   
   /**
    * Default implementation of ThreadManager.
  @@ -27,7 +26,7 @@
    */
   public class DefaultThreadManager
       extends AbstractLogEnabled
  -    implements Block, ThreadManager, Configurable
  +    implements ThreadManager, Configurable
   {
       ///Map of thread pools for application
       private HashMap m_threadPools = new HashMap();
  
  
  
  1.6       +2 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/authentication/DefaultAuthenticator.java
  
  Index: DefaultAuthenticator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/authentication/DefaultAuthenticator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultAuthenticator.java	12 May 2002 08:06:41 -0000	1.5
  +++ DefaultAuthenticator.java	18 May 2002 09:50:39 -0000	1.6
  @@ -8,7 +8,6 @@
   package org.apache.avalon.cornerstone.blocks.transport.authentication;
   
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.excalibur.altrmi.common.AltrmiAuthentication;
   import org.apache.excalibur.altrmi.common.AltrmiAuthenticationException;
   import org.apache.excalibur.altrmi.server.AltrmiAuthenticator;
  @@ -18,10 +17,10 @@
    * @phoenix:service name="org.apache.excalibur.altrmi.server.AltrmiAuthenticator"
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class DefaultAuthenticator
  -    implements AltrmiAuthenticator, Initializable, Block
  +    implements AltrmiAuthenticator, Initializable
   {
       private AltrmiAuthenticator m_altrmiAuthenticator;
   
  
  
  
  1.10      +3 -6      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/AutoPublisher.java
  
  Index: AutoPublisher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/AutoPublisher.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AutoPublisher.java	12 May 2002 08:06:41 -0000	1.9
  +++ AutoPublisher.java	18 May 2002 09:50:39 -0000	1.10
  @@ -16,7 +16,6 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.phoenix.ApplicationEvent;
   import org.apache.avalon.phoenix.ApplicationListener;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockEvent;
   import org.apache.excalibur.altrmi.server.AltrmiPublisher;
   import org.apache.excalibur.altrmi.server.PublicationException;
  @@ -26,7 +25,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class AutoPublisher
       implements Configurable, ApplicationListener
  @@ -83,8 +82,7 @@
           for( int i = 0; i < m_events.size(); i++ )
           {
               final BlockEvent event = (BlockEvent)m_events.elementAt( i );
  -            final Block block = event.getBlock();
  -            final String blockName = event.getName();
  +            final Object block = event.getBlock();
               PublicationInfo pi = (PublicationInfo)m_publications.get( event.getName() );
   
               try
  @@ -114,8 +112,7 @@
   
               if( m_publications.containsKey( event.getName() ) )
               {
  -                final Block block = event.getBlock();
  -                final String blockName = event.getName();
  +                final Object block = event.getBlock();
                   PublicationInfo pi = (PublicationInfo)m_publications.get( event.getName()
);
   
                   try
  
  
  
  1.17      +2 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/AbstractPublisher.java
  
  Index: AbstractPublisher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/AbstractPublisher.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractPublisher.java	18 May 2002 04:11:16 -0000	1.16
  +++ AbstractPublisher.java	18 May 2002 09:50:39 -0000	1.17
  @@ -26,7 +26,6 @@
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.ServiceException;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.excalibur.altrmi.common.MethodRequest;
   import org.apache.excalibur.altrmi.server.AltrmiAuthenticator;
  @@ -43,12 +42,12 @@
    * @phoenix:service name="org.apache.excalibur.altrmi.server.AltrmiPublisher"
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public abstract class AbstractPublisher
       extends AbstractLogEnabled
       implements AltrmiPublisher, Startable, Serviceable, Contextualizable, Configurable,
  -    Initializable, Block
  +    Initializable
   {
   
       protected AbstractServer m_abstractServer;
  
  
  
  1.12      +2 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/AbstractSubscriber.java
  
  Index: AbstractSubscriber.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/AbstractSubscriber.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractSubscriber.java	12 May 2002 08:06:41 -0000	1.11
  +++ AbstractSubscriber.java	18 May 2002 09:50:40 -0000	1.12
  @@ -12,7 +12,6 @@
   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.phoenix.Block;
   import org.apache.excalibur.altrmi.client.AltrmiFactory;
   import org.apache.excalibur.altrmi.client.AltrmiHostContext;
   import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
  @@ -25,11 +24,11 @@
    * @phoenix:service name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public abstract class AbstractSubscriber
       extends AbstractLogEnabled
  -    implements AltrmiInterfaceLookup, Configurable, Initializable, Block
  +    implements AltrmiInterfaceLookup, Configurable, Initializable
   {
       protected AltrmiFactory m_altrmiFactory;
       protected AltrmiHostContext m_hostContext;
  
  
  
  1.10      +1 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java
  
  Index: AbstractService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractService.java	26 Apr 2002 07:38:52 -0000	1.9
  +++ AbstractService.java	18 May 2002 09:50:40 -0000	1.10
  @@ -26,7 +26,6 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
   /**
  @@ -36,7 +35,7 @@
    */
   public abstract class AbstractService
       extends AbstractLogEnabled
  -    implements Block, Contextualizable, Composable, Configurable, Initializable, Disposable
  +    implements Contextualizable, Composable, Configurable, Initializable, Disposable
   {
       protected ConnectionManager m_connectionManager;
       protected SocketManager m_socketManager;
  
  
  

--
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