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-apps/xcommander/src/java/org/apache/avalon/xcommander XCommanderServer.java
Date Sat, 18 May 2002 09:49:02 GMT
donaldp     02/05/18 02:49:01

  Modified:    db/src/java/org/apache/avalon/db/actioncache
                        DefaultActionCache.java
               db/src/java/org/apache/avalon/db/basic/parser
                        BasicDualParserManager.java
               db/src/java/org/apache/avalon/db/optimizer
                        DefaultSQLOptimizer.java
               db/src/java/org/apache/avalon/db/persistence/inmemory
                        NoPersistence.java
               db/src/java/org/apache/avalon/db/server
                        AbstractParserManager.java
               db/src/java/org/apache/avalon/db/transport/altrmi/server
                        AltrmiDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/cmdstream/server
                        PlainCMDDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/soap/server
                        SoapDatabaseManager.java
               demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver
                        AltrmiHelloWorldServerImpl.java
               demo/src/java/org/apache/avalon/apps/demos/helloworldserver
                        HelloWorldServerImpl.java
               demo/src/java/org/apache/avalon/apps/demos/rmihelloworldserver
                        RMIHelloWorldServerImpl.java
               demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver
                        SOAPHelloWorldServerImpl.java
               ftpserver/src/java/org/apache/avalon/ftpserver
                        FtpServerImpl.java
               ftpserver/src/java/org/apache/avalon/ftpserver/ip
                        AbstractIpRestrictor.java
               ftpserver/src/java/org/apache/avalon/ftpserver/usermanager
                        AbstractUserManager.java
               hsql/src/java/org/apache/avalon/hsql/blocks
                        DefaultHypersonicSQL.java
               httpproxy/src/java/org/apache/avalon/httpproxy
                        AbstractHttpProxyServer.java
               overlord/src/java/org/apache/avalon/overlord Overlord.java
               xcommander/src/java/org/apache/avalon/xcommander
                        XCommanderServer.java
  Log:
  Remove reliance on Block marker interface.
  
  Revision  Changes    Path
  1.5       +30 -62    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java
  
  Index: DefaultActionCache.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultActionCache.java	12 May 2002 10:09:23 -0000	1.4
  +++ DefaultActionCache.java	18 May 2002 09:49:00 -0000	1.5
  @@ -1,4 +1,3 @@
  -
   /*
    * Copyright (C) The Apache Software Foundation. All rights reserved.
    *
  @@ -8,75 +7,44 @@
    */
   package org.apache.avalon.db.actioncache;
   
  -
  -
   import org.apache.avalon.db.services.ActionCache;
  -import org.apache.avalon.db.services.ParserManager;
  -import org.apache.avalon.phoenix.Block;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.activity.Initializable;
   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.activity.Initializable;
  +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.Serviceable;
  -import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.ServiceException;
  -
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   
   /**
  - * Class DefaultActionCache
  - *
  - *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
  -public class DefaultActionCache extends AbstractLogEnabled
  -        implements ActionCache, Block, Contextualizable, Serviceable, Configurable, Initializable {
  -
  -    // intended to be a "no cache" cache.
  -
  -    /**
  -     * Method contextualize
  -     *
  -     *
  -     * @param context
  -     *
  -     * @throws ContextException
  -     *
  -     */
  -    public void contextualize(Context context) throws ContextException {}
  -
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
  -    public void service(ServiceManager serviceManager) throws ServiceException {}
  -
  -    /**
  -     * Method configure
  -     *
  -     *
  -     * @param configuration
  -     *
  -     * @throws ConfigurationException
  -     *
  -     */
  -    public void configure(Configuration configuration) throws ConfigurationException {}
  -
  -    /**
  -     * Method initialize
  -     *
  -     *
  -     * @throws Exception
  -     *
  -     */
  -    public void initialize() throws Exception {}
  +public class DefaultActionCache
  +    extends AbstractLogEnabled
  +    implements ActionCache, Contextualizable, Serviceable, Configurable, Initializable
  +{
  +    public void contextualize( final Context context )
  +        throws ContextException
  +    {
  +    }
  +
  +    public void service( final ServiceManager serviceManager )
  +        throws ServiceException
  +    {
  +    }
  +
  +    public void configure( final Configuration configuration )
  +        throws ConfigurationException
  +    {
  +    }
  +
  +    public void initialize()
  +        throws Exception
  +    {
  +    }
   }
  
  
  
  1.5       +7 -51     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java
  
  Index: BasicDualParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BasicDualParserManager.java	12 May 2002 10:09:23 -0000	1.4
  +++ BasicDualParserManager.java	18 May 2002 09:49:00 -0000	1.5
  @@ -19,24 +19,18 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.db.services.ParserManager;
   import org.apache.avalon.db.transport.Request;
   import org.apache.avalon.db.transport.Reply;
   import org.apache.avalon.db.actions.Action;
   import org.apache.avalon.db.actions.ActionException;
  -import org.apache.avalon.db.server.AbstractRequestHandler;
  -
  -import java.io.InputStream;
  -
   
   /**
  - * Class BasicDualParserManager
  - *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
    */
  -public class BasicDualParserManager extends AbstractLogEnabled
  -        implements Block, ParserManager, Contextualizable, Serviceable, Configurable, Initializable  {
  +public class BasicDualParserManager
  +    extends AbstractLogEnabled
  +        implements ParserManager, Contextualizable, Serviceable, Configurable, Initializable  {
   
       private BasicLXSQLParserManager mBasicLXSQLParserMgr;
       private BasicSQLParserManager mBasicSQLParserMgr;
  @@ -46,66 +40,28 @@
           mBasicSQLParserMgr = new BasicSQLParserManager();
       }
   
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
       public void service(ServiceManager serviceManager) throws ServiceException {
           mBasicLXSQLParserMgr.service(serviceManager);
           if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.service(serviceManager);
       }
   
  -    /**
  -     * Set the components logger.
  -     *
  -     * @param logger the logger
  -     */
       public void enableLogging(Logger logger) {
           super.enableLogging(logger);
           mBasicLXSQLParserMgr.enableLogging(logger);
           if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.enableLogging(logger);
       }
   
  -    /**
  -     * Method configure
  -     *
  -     *
  -     * @param configuration
  -     *
  -     * @throws ConfigurationException
  -     *
  -     */
       public void configure(Configuration configuration) throws ConfigurationException {
           mBasicLXSQLParserMgr.configure(configuration);
           if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.configure(configuration);
       }
   
  -    /**
  -     * Pass the Context to the component.
  -     * This method is called after the Loggable.setLogger() (if present)
  -     * method and before any other method.
  -     *
  -     * @param context the context
  -     * @exception ContextException if context is invalid
  -     */
  -    public void contextualize(Context context)
  +    public void contextualize(final Context context)
               throws ContextException {
           mBasicLXSQLParserMgr.contextualize(context);
           if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.contextualize(context);
       }
   
  -    /**
  -     * Initialialize the component. Initialization includes
  -     * allocating any resources required throughout the
  -     * components lifecycle.
  -     *
  -     * @exception Exception if an error occurs
  -     */
       public void initialize()
               throws Exception {
           mBasicLXSQLParserMgr.initialize();
  @@ -113,7 +69,7 @@
       }
   
       // overrides parent.
  -    public Reply processRequest(Request request) {
  +    public Reply processRequest( final Request request ) {
   
           if (request.getSQLSyntax() == Request.SYNTAX_LXSQL) {
               System.out.println("LXSQL");
  @@ -123,8 +79,8 @@
           }
       }
   
  -    public void initializeAction(Action action) throws ActionException {
  +    public void initializeAction( final Action action )
  +        throws ActionException {
           // not needed.
       }
  -
   }
  
  
  
  1.4       +26 -68    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/optimizer/DefaultSQLOptimizer.java
  
  Index: DefaultSQLOptimizer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/optimizer/DefaultSQLOptimizer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultSQLOptimizer.java	12 May 2002 10:09:23 -0000	1.3
  +++ DefaultSQLOptimizer.java	18 May 2002 09:49:00 -0000	1.4
  @@ -1,4 +1,3 @@
  -
   /*
    * Copyright (C) The Apache Software Foundation. All rights reserved.
    *
  @@ -8,87 +7,46 @@
    */
   package org.apache.avalon.db.optimizer;
   
  -
  -
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.db.services.SQLOptimizer;
   import org.apache.avalon.db.transport.SelectRequest;
   import org.apache.avalon.framework.activity.Initializable;
   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.service.Serviceable;
  -import org.apache.avalon.framework.service.ServiceManager;
  -import org.apache.avalon.framework.service.ServiceException;
  -import org.apache.avalon.framework.context.Contextualizable;
   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;
   
   /**
  - * Class DefaultSQLOptimizer
  - *
  - *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
  -public class DefaultSQLOptimizer extends AbstractLogEnabled
  -        implements Block, SQLOptimizer, Contextualizable, Serviceable, Configurable,
  -                   Initializable {
  -
  -    /**
  -     * Method optimizeSelectRequest
  -     *
  -     *
  -     * @param selectRequest
  -     *
  -     * @return
  -     *
  -     */
  -    public SelectRequest optimizeSelectRequest(SelectRequest selectRequest) {
  +public class DefaultSQLOptimizer
  +    extends AbstractLogEnabled
  +    implements SQLOptimizer, Contextualizable, Serviceable, Configurable, Initializable
  +{
  +    public SelectRequest optimizeSelectRequest( SelectRequest selectRequest )
  +    {
           return selectRequest;
       }
   
  -    /**
  -     * Method contextualize
  -     *
  -     *
  -     * @param context
  -     *
  -     * @throws ContextException
  -     *
  -     */
  -    public void contextualize(Context context) throws ContextException {}
  -
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
  -    public void service(ServiceManager serviceManager) throws ServiceException {}
  -
  -    /**
  -     * Method configure
  -     *
  -     *
  -     * @param configuration
  -     *
  -     * @throws ConfigurationException
  -     *
  -     */
  -    public void configure(Configuration configuration) throws ConfigurationException {}
  -
  -    /**
  -     * Method initialize
  -     *
  -     *
  -     * @throws Exception
  -     *
  -     */
  -    public void initialize() throws Exception {}
  +    public void contextualize( Context context ) throws ContextException
  +    {
  +    }
  +
  +    public void service( ServiceManager serviceManager ) throws ServiceException
  +    {
  +    }
  +
  +    public void configure( Configuration configuration ) throws ConfigurationException
  +    {
  +    }
  +
  +    public void initialize() throws Exception
  +    {
  +    }
   }
  
  
  
  1.14      +4 -60     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java
  
  Index: NoPersistence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- NoPersistence.java	12 May 2002 10:09:23 -0000	1.13
  +++ NoPersistence.java	18 May 2002 09:49:00 -0000	1.14
  @@ -8,13 +8,7 @@
    */
   package org.apache.avalon.db.persistence.inmemory;
   
  -
  -
   import org.apache.avalon.db.services.DatabasePersistor;
  -import org.apache.avalon.db.services.ActionCache;
  -import org.apache.avalon.db.data.Table;
  -import org.apache.avalon.db.data.View;
  -import org.apache.avalon.db.data.Index;
   import org.apache.avalon.db.data.Queryable;
   import org.apache.avalon.db.data.impl.DefaultUser;
   import org.apache.avalon.db.server.DBRequestContext;
  @@ -32,80 +26,31 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.phoenix.Block;
  -
   import java.util.HashMap;
   
  -
   /**
  - * Class NoPersistence
  - *
  - *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
  -public class NoPersistence extends AbstractLogEnabled
  -        implements DatabasePersistor, Block, Contextualizable, Serviceable, Configurable,
  -                   Initializable {
  +public class NoPersistence
  +    extends AbstractLogEnabled
  +    implements DatabasePersistor, Contextualizable, Serviceable, Configurable, Initializable {
   
       private HashMap mAddressableObjects = new HashMap();
       private DefaultDBRequestContext mDefaultDBRequestContext;
       private DefaultDBStatement mDefaultDBStatement;
   
  -    /**
  -     * Method contextualize
  -     *
  -     *
  -     * @param context
  -     *
  -     * @throws ContextException
  -     *
  -     */
       public void contextualize(Context context) throws ContextException {}
   
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
       public void service(ServiceManager serviceManager) throws ServiceException {}
   
  -    /**
  -     * Method configure
  -     *
  -     *
  -     * @param configuration
  -     *
  -     * @throws ConfigurationException
  -     *
  -     */
       public void configure(Configuration configuration) throws ConfigurationException {}
   
  -    /**
  -     * Method initialize
  -     *
  -     *
  -     * @throws Exception
  -     *
  -     */
       public void initialize() throws Exception {
           mDefaultDBRequestContext = new DefaultDBRequestContext(this,new DefaultUser("Hello Ho Are You?", "hello"));
           mDefaultDBStatement = new DefaultDBStatement(this);
       }
   
  -    /**
  -     * Method queryableExists
  -     *
  -     *
  -     * @param queryableName
  -     *
  -     * @return
  -     *
  -     */
       public boolean queryableExists(String queryableName) {
           return mAddressableObjects.containsKey(queryableName);
       }
  @@ -129,5 +74,4 @@
       public DBStatement getDBStatement(String statementID) {
           return mDefaultDBStatement;
       }
  -
   }
  
  
  
  1.6       +2 -3      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java
  
  Index: AbstractParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractParserManager.java	12 May 2002 10:09:24 -0000	1.5
  +++ AbstractParserManager.java	18 May 2002 09:49:00 -0000	1.6
  @@ -19,7 +19,6 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.db.services.ParserManager;
   import org.apache.avalon.db.services.DatabasePersistor;
  @@ -42,10 +41,10 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public abstract class AbstractParserManager extends AbstractLogEnabled
  -        implements Block, ParserManager, Contextualizable, Serviceable, Configurable, Initializable  {
  +        implements ParserManager, Contextualizable, Serviceable, Configurable, Initializable  {
   
       protected DatabasePersistor mDatabasePersistor;
       protected static int mGenObjSeq;
  
  
  
  1.5       +17 -41    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java
  
  Index: AltrmiDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AltrmiDatabaseManager.java	12 May 2002 10:09:24 -0000	1.4
  +++ AltrmiDatabaseManager.java	18 May 2002 09:49:00 -0000	1.5
  @@ -1,4 +1,3 @@
  -
   /*
    * Copyright (C) The Apache Software Foundation. All rights reserved.
    *
  @@ -10,13 +9,12 @@
   
   import org.apache.avalon.db.server.AbstractDatabaseManager;
   import org.apache.avalon.db.services.DatabaseManager;
  -import org.apache.avalon.phoenix.Block;
  -import org.apache.avalon.phoenix.BlockContext;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.context.Context;
  +import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.phoenix.BlockContext;
   import org.apache.excalibur.altrmi.server.AltrmiPublisher;
   
   /**
  @@ -24,51 +22,29 @@
    * @version 1.0
    */
   public class AltrmiDatabaseManager extends AbstractDatabaseManager
  -        implements Block, DatabaseManager, Contextualizable,
  -        Initializable  {
  +    implements DatabaseManager, Contextualizable,
  +    Initializable
  +{
   
       protected BlockContext mContext;
       protected AltrmiPublisher mAltrmiPublisher;
   
  -    /**
  -     * Method contextualize
  -     *
  -     *
  -     * @param context
  -     *
  -     */
  -    public void contextualize(final Context context) {
  -        mContext = (BlockContext) context;
  +    public void contextualize( final Context context )
  +    {
  +        mContext = (BlockContext)context;
       }
   
  +    public void service( final ServiceManager serviceManager ) throws ServiceException
  +    {
   
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
  -    public void service(final ServiceManager serviceManager) throws ServiceException {
  -
  -        super.service(serviceManager);
  -        mAltrmiPublisher = (AltrmiPublisher) serviceManager.lookup(AltrmiPublisher.class.getName());
  +        super.service( serviceManager );
  +        mAltrmiPublisher = (AltrmiPublisher)serviceManager.lookup( AltrmiPublisher.class.getName() );
       }
   
  -
  -    /**
  -     * Method initialize
  -     *
  -     *
  -     * @throws Exception
  -     *
  -     */
  -    public void initialize() throws Exception {
  +    public void initialize() throws Exception
  +    {
           //TODO published name should be taken from config.xml
  -        mAltrmiPublisher.publish(this, "AvalonDB", DatabaseManager.class);
  -        System.out.println("AvalonDBListener server running using AltRMI");
  +        mAltrmiPublisher.publish( this, "AvalonDB", DatabaseManager.class );
  +        System.out.println( "AvalonDBListener server running using AltRMI" );
       }
  -
   }
  
  
  
  1.11      +65 -103   jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java
  
  Index: PlainCMDDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PlainCMDDatabaseManager.java	12 May 2002 10:09:24 -0000	1.10
  +++ PlainCMDDatabaseManager.java	18 May 2002 09:49:01 -0000	1.11
  @@ -1,4 +1,3 @@
  -
   /*
    * Copyright (C) The Apache Software Foundation. All rights reserved.
    *
  @@ -8,42 +7,34 @@
    */
   package org.apache.avalon.db.transport.cmdstream.server;
   
  -
  -
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.avalon.framework.service.ServiceException;
  -import org.apache.avalon.framework.service.ServiceManager;
  +import java.io.File;
  +import java.net.InetAddress;
  +import java.net.ServerSocket;
  +import java.net.UnknownHostException;
  +import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
  +import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
  +import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
  +import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
  +import org.apache.avalon.cornerstone.services.sockets.SocketManager;
  +import org.apache.avalon.db.server.AbstractDatabaseManager;
  +import org.apache.avalon.db.services.DatabaseManager;
   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.activity.Initializable;
  -import org.apache.avalon.phoenix.Block;
  +import org.apache.avalon.framework.context.Context;
  +import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.phoenix.BlockContext;
  -import org.apache.avalon.db.services.DatabaseManager;
  -import org.apache.avalon.db.server.AbstractDatabaseManager;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
  -import org.apache.avalon.cornerstone.services.sockets.SocketManager;
  -import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
  -
  -import java.net.InetAddress;
  -import java.net.UnknownHostException;
  -import java.net.ServerSocket;
  -
  -import java.io.File;
  -
   
   /**
    * @author  Paul Hammant <Paul_Hammant@yahoo.com>
    * @version 1.0
    */
  -public class PlainCMDDatabaseManager extends AbstractDatabaseManager
  -        implements Block, DatabaseManager, Contextualizable, Configurable,
  -                   ConnectionHandlerFactory {
  +public class PlainCMDDatabaseManager
  +    extends AbstractDatabaseManager
  +    implements DatabaseManager, Contextualizable, Configurable, ConnectionHandlerFactory
  +{
   
       protected SocketManager mSocketManager;
       protected ConnectionManager mConnectionManager;
  @@ -53,108 +44,79 @@
       protected String mDatabaseName;
       protected PlainCMDDatabaseManager mPlainCMDDatabaseManager;
   
  -    /**
  -     * Method contextualize
  -     *
  -     *
  -     * @param context
  -     *
  -     */
  -    public void contextualize(final Context context) {
  -        mContext = (BlockContext) context;
  +    public void contextualize( final Context context )
  +    {
  +        mContext = (BlockContext)context;
       }
   
  -    /**
  -     * Method configure
  -     *
  -     *
  -     * @param configuration
  -     *
  -     * @throws ConfigurationException
  -     *
  -     */
  -    public void configure(final Configuration configuration) throws ConfigurationException {
  -
  -        mPort = configuration.getChild("port").getValueAsInteger(9001);
  -
  -        System.out.println("port=" + mPort);
  -
  -        Configuration db = configuration.getChild("database");
  -        String dbType = db.getAttribute("type");
  -        String dbName = db.getAttribute("name");
  +    public void configure( final Configuration configuration ) throws ConfigurationException
  +    {
   
  -        if (dbType.equals("contained")) {
  +        mPort = configuration.getChild( "port" ).getValueAsInteger( 9001 );
  +
  +        System.out.println( "port=" + mPort );
  +
  +        Configuration db = configuration.getChild( "database" );
  +        String dbType = db.getAttribute( "type" );
  +        String dbName = db.getAttribute( "name" );
  +
  +        if( dbType.equals( "contained" ) )
  +        {
               mDatabaseName = mContext.getBaseDirectory().getAbsolutePath() + File.separator
  -                             + dbName;
  -        } else {
  +                + dbName;
  +        }
  +        else
  +        {
               mDatabaseName = dbName;
           }
   
  -        try {
  -            final String bindAddress = configuration.getChild("bind").getValue();
  +        try
  +        {
  +            final String bindAddress = configuration.getChild( "bind" ).getValue();
   
  -            mBindTo = InetAddress.getByName(bindAddress);
  -            System.out.println("AvalonDB started!");
  -        } catch (final UnknownHostException unhe) {
  -            throw new ConfigurationException("Malformed bind parameter", unhe);
  +            mBindTo = InetAddress.getByName( bindAddress );
  +            System.out.println( "AvalonDB started!" );
  +        }
  +        catch( final UnknownHostException unhe )
  +        {
  +            throw new ConfigurationException( "Malformed bind parameter", unhe );
           }
       }
   
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
  -    public void service(final ServiceManager serviceManager) throws ServiceException {
  +    public void service( final ServiceManager serviceManager ) throws ServiceException
  +    {
   
  -        super.service(serviceManager);
  +        super.service( serviceManager );
   
  -        mSocketManager = (SocketManager) serviceManager.lookup(SocketManager.ROLE);
  -        mConnectionManager = (ConnectionManager) serviceManager.lookup(ConnectionManager.ROLE);
  +        mSocketManager = (SocketManager)serviceManager.lookup( SocketManager.ROLE );
  +        mConnectionManager = (ConnectionManager)serviceManager.lookup( ConnectionManager.ROLE );
       }
   
  -    /**
  -     * Method initialize
  -     *
  -     *
  -     * @throws Exception
  -     *
  -     */
  -    public void initialize() throws Exception {
  +    public void initialize() throws Exception
  +    {
   
  -        final ServerSocketFactory factory = mSocketManager.getServerSocketFactory("plain");
  -        final ServerSocket serverSocket = factory.createServerSocket(mPort, 5, mBindTo);
  +        final ServerSocketFactory factory = mSocketManager.getServerSocketFactory( "plain" );
  +        final ServerSocket serverSocket = factory.createServerSocket( mPort, 5, mBindTo );
   
           super.initialize();
   
  -        mConnectionManager.connect("AvalonDBListener", serverSocket, this);
  -        System.out.println("AvalonDBListener server running on port " + mPort);
  +        mConnectionManager.connect( "AvalonDBListener", serverSocket, this );
  +        System.out.println( "AvalonDBListener server running on port " + mPort );
       }
   
  -    /**
  -     * Construct an appropriate ConnectionHandler.
  -     *
  -     * @return the new ConnectionHandler
  -     * @exception Exception if an error occurs
  -     */
  -    public ConnectionHandler createConnectionHandler() throws Exception {
  +    public ConnectionHandler createConnectionHandler() throws Exception
  +    {
   
  -        System.out.println("");
  +        System.out.println( "" );
   
  -        CMDConnectionHandler dbConnectionHandler = new CMDConnectionHandler(this);
  +        CMDConnectionHandler dbConnectionHandler = new CMDConnectionHandler( this );
   
  -        setupLogger(dbConnectionHandler);
  +        setupLogger( dbConnectionHandler );
   
           return dbConnectionHandler;
       }
   
  -    /**
  -     * Release a previously created ConnectionHandler e.g. for spooling.
  -     */
  -    public void releaseConnectionHandler(ConnectionHandler connectionHandler) {
  +    public void releaseConnectionHandler( ConnectionHandler connectionHandler )
  +    {
       }
   }
  
  
  
  1.6       +19 -63    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java
  
  Index: SoapDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SoapDatabaseManager.java	12 May 2002 10:09:24 -0000	1.5
  +++ SoapDatabaseManager.java	18 May 2002 09:49:01 -0000	1.6
  @@ -1,4 +1,3 @@
  -
   /*
    * Copyright (C) The Apache Software Foundation. All rights reserved.
    *
  @@ -8,86 +7,43 @@
    */
   package org.apache.avalon.db.transport.soap.server;
   
  -
  -
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.cornerstone.services.soapification.SOAPification;
  +import org.apache.avalon.db.server.AbstractDatabaseManager;
  +import org.apache.avalon.db.services.DatabaseManager;
  +import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
  -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.activity.Initializable;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
  -import org.apache.avalon.db.services.DatabaseManager;
  -import org.apache.avalon.db.server.AbstractDatabaseManager;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
  -import org.apache.avalon.cornerstone.services.sockets.SocketManager;
  -import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
  -import org.apache.avalon.cornerstone.services.soapification.SOAPification;
  -
  -
  -import java.net.InetAddress;
  -import java.net.UnknownHostException;
  -import java.net.ServerSocket;
  -
  -import java.io.File;
  -
   
   /**
    * @author  Paul Hammant <Paul_Hammant@yahoo.com>
    * @version 1.0
    */
  -public class SoapDatabaseManager extends AbstractDatabaseManager
  -        implements Block, DatabaseManager, Contextualizable,
  -                   Initializable  {
  +public class SoapDatabaseManager
  +    extends AbstractDatabaseManager
  +    implements DatabaseManager, Contextualizable, Initializable
  +{
   
       protected BlockContext mContext;
       protected SOAPification mSOAPification;
   
  -    /**
  -     * Method contextualize
  -     *
  -     *
  -     * @param context
  -     *
  -     */
  -    public void contextualize(final Context context) {
  -        mContext = (BlockContext) context;
  +    public void contextualize( final Context context )
  +    {
  +        mContext = (BlockContext)context;
       }
   
  +    public void service( final ServiceManager serviceManager ) throws ServiceException
  +    {
   
  -    /**
  -     * Method service
  -     *
  -     *
  -     * @param serviceManager
  -     *
  -     * @throws ServiceException
  -     *
  -     */
  -    public void service(final ServiceManager serviceManager) throws ServiceException {
  -
  -        super.service(serviceManager);
  -        mSOAPification = (SOAPification) serviceManager.lookup(SOAPification.ROLE);
  +        super.service( serviceManager );
  +        mSOAPification = (SOAPification)serviceManager.lookup( SOAPification.ROLE );
       }
   
  -
  -    /**
  -     * Method initialize
  -     *
  -     *
  -     * @throws Exception
  -     *
  -     */
  -    public void initialize() throws Exception {
  +    public void initialize() throws Exception
  +    {
           //TODO published name should be taken from config.xml
  -        mSOAPification.publish(this, "AvalonDB", DatabaseManager.class);
  +        mSOAPification.publish( this, "AvalonDB", DatabaseManager.class );
       }
  -
   }
  
  
  
  1.7       +1 -2      jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerImpl.java
  
  Index: AltrmiHelloWorldServerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AltrmiHelloWorldServerImpl.java	14 May 2002 23:27:13 -0000	1.6
  +++ AltrmiHelloWorldServerImpl.java	18 May 2002 09:49:01 -0000	1.7
  @@ -17,7 +17,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;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.excalibur.altrmi.server.AltrmiPublisher;
   
  @@ -43,7 +42,7 @@
    */
   public class AltrmiHelloWorldServerImpl
       extends AbstractLogEnabled
  -    implements Block, Serviceable, Configurable, Initializable
  +    implements Serviceable, Configurable, Initializable
   {
       protected HelloWorldServer mHelloWorldServer;
       protected AltrmiPublisher mAltrmiPublisher;
  
  
  
  1.6       +1 -2      jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldServerImpl.java
  
  Index: HelloWorldServerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldServerImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HelloWorldServerImpl.java	14 May 2002 11:02:54 -0000	1.5
  +++ HelloWorldServerImpl.java	18 May 2002 09:49:01 -0000	1.6
  @@ -25,7 +25,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;
   import org.apache.avalon.phoenix.BlockContext;
   
   /**
  @@ -35,7 +34,7 @@
    */
   public class HelloWorldServerImpl
       extends AbstractLogEnabled
  -    implements Block, HelloWorldServer, Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
  +    implements HelloWorldServer, Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
   {
       protected SocketManager m_socketManager;
       protected ConnectionManager m_connectionManager;
  
  
  
  1.4       +1 -2      jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/rmihelloworldserver/RMIHelloWorldServerImpl.java
  
  Index: RMIHelloWorldServerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/rmihelloworldserver/RMIHelloWorldServerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RMIHelloWorldServerImpl.java	12 May 2002 10:13:44 -0000	1.3
  +++ RMIHelloWorldServerImpl.java	18 May 2002 09:49:01 -0000	1.4
  @@ -16,7 +16,6 @@
   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.phoenix.Block;
   import org.apache.avalon.cornerstone.services.rmification.RMIfication;
   
   /**
  @@ -24,7 +23,7 @@
    */
   public class RMIHelloWorldServerImpl
       extends AbstractLogEnabled
  -    implements Serviceable, Configurable, Initializable, RMIHelloWorldServer, Block
  +    implements Serviceable, Configurable, Initializable, RMIHelloWorldServer
   {
       private RMIfication m_rmification;
       private String m_publicationName;
  
  
  
  1.5       +9 -10     jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver/SOAPHelloWorldServerImpl.java
  
  Index: SOAPHelloWorldServerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver/SOAPHelloWorldServerImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SOAPHelloWorldServerImpl.java	14 May 2002 23:27:13 -0000	1.4
  +++ SOAPHelloWorldServerImpl.java	18 May 2002 09:49:01 -0000	1.5
  @@ -16,22 +16,21 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.cornerstone.services.soapification.SOAPification;
   import org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer;
   
   /**
  - * This demo Server applications shows the use of SOAP to publish the 
  + * This demo Server applications shows the use of SOAP to publish the
    * HelloWorld block's API to clients over TCP/IP.
    *
  - * HelloWorld would normally mount as just a HTTP hack showing a HTML 
  - * HelloWorld message to suitably forgiving Browsers.  With the 
  + * HelloWorld would normally mount as just a HTTP hack showing a HTML
  + * HelloWorld message to suitably forgiving Browsers.  With the
    * addition of this block and suitably assembled, the HelloWorld
    * application is given more life.
    *
  - * All of the following jars from Glue-Standard's download need 
  - * to be inside the lib dir of Cornerstone's root to cause 
  + * All of the following jars from Glue-Standard's download need
  + * to be inside the lib dir of Cornerstone's root to cause
    * SOAPHelloWorldServer and the Glue block to compile, be included in BARs
    * and cause the creation of the relevant SARs :-
    *
  @@ -42,20 +41,20 @@
    * jcert.jar
    * jnet.jar
    * jsse.jar
  - * 
  + *
    * @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
    * @version 1.0
    */
   public class SOAPHelloWorldServerImpl
       extends AbstractLogEnabled
  -    implements Block, Serviceable, Configurable, Initializable
  +    implements Serviceable, Configurable, Initializable
   {
       protected HelloWorldServer    mHelloWorldServer;
   
       protected SOAPification       mSOAPification;
   
       protected BlockContext        m_context;
  -    
  +
       protected String publicationName;
   
       public void initialize() throws Exception {
  @@ -65,7 +64,7 @@
           System.out.println("SOAPHelloWorld WSDL server running.  Use SOAPHelloWorldTester to connect to URL listed above to test it");
   
       }
  -    
  +
       public void contextualize( final Context context )
       {
           m_context = (BlockContext)context;
  
  
  
  1.15      +13 -15    jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpServerImpl.java
  
  Index: FtpServerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpServerImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- FtpServerImpl.java	12 May 2002 10:36:09 -0000	1.14
  +++ FtpServerImpl.java	18 May 2002 09:49:01 -0000	1.15
  @@ -34,7 +34,6 @@
   import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
   import org.apache.avalon.cornerstone.services.sockets.SocketManager;
   
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
   
  @@ -48,27 +47,26 @@
    * @version 1.0
    */
   public class FtpServerImpl extends AbstractLogEnabled
  -                           implements Block,
  -                                      FtpServerInterface,
  +                           implements FtpServerInterface,
                                         Contextualizable,
                                         Serviceable,
                                         Configurable,
                                         Disposable,
                                         ConnectionHandlerFactory {
  -    
  +
       private ServerSocket mServerSocket    = null;
       private SocketManager mSocManager     = null;
       private ConnectionManager mConManager = null;
       private ServiceManager mServiceManager = null;
       private BlockContext mContext         = null;
       private FtpConfig mConfig             = null;
  -    
  +
       /**
        * Default constructor - does nothing.
        */
       public FtpServerImpl() {
       }
  -    
  +
       /**
        * Set application context - first spep.
        */
  @@ -84,8 +82,8 @@
               throw new ContextException("FtpServerImpl.contextualize()", ex);
           }
       }
  -    
  -    
  +
  +
       /**
        * Get all managers - second step.
        */
  @@ -93,7 +91,7 @@
           mServiceManager = serviceManager;
           try {
               mConfig.setServiceManager(mServiceManager);
  -    
  +
           }
           catch(Exception ex) {
               getLogger().error("FtpServerImpl.compose()", ex);
  @@ -102,8 +100,8 @@
           mSocManager = (SocketManager)serviceManager.lookup(SocketManager.ROLE);
           mConManager = (ConnectionManager)serviceManager.lookup(ConnectionManager.ROLE);
       }
  -    
  -    
  +
  +
       /**
        * Configure the server - third step.
        *
  @@ -111,19 +109,19 @@
        */
       public void configure(Configuration conf) throws ConfigurationException {
          try {
  -            mConfig.setConfiguration(conf);        
  +            mConfig.setConfiguration(conf);
   
               // open server socket
               ServerSocketFactory factory = mSocManager.getServerSocketFactory("plain");
               InetAddress serverAddress = mConfig.getServerAddress();
               if(serverAddress == null) {
                   mServerSocket = factory.createServerSocket(mConfig.getServerPort(), 5);
  -            }            
  +            }
               else {
                   mServerSocket = factory.createServerSocket(mConfig.getServerPort(), 5, serverAddress);
               }
               mConManager.connect(DISPLAY_NAME, mServerSocket, this);
  -            
  +
               System.out.println("FTP server ready!");
               if(mConfig.isRemoteAdminAllowed()) {
                   System.out.println("You can start the remote admin by executing \"java -jar ftp-admin.jar\".");
  @@ -137,7 +135,7 @@
   
       /**
        * Release all resources.
  -     */        
  +     */
       public void dispose() {
           getLogger().info("Closing Ftp server...");
           if (mConfig != null) {
  
  
  
  1.4       +17 -19    jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/AbstractIpRestrictor.java
  
  Index: AbstractIpRestrictor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/AbstractIpRestrictor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractIpRestrictor.java	12 May 2002 10:36:09 -0000	1.3
  +++ AbstractIpRestrictor.java	18 May 2002 09:49:01 -0000	1.4
  @@ -10,7 +10,6 @@
   
   import java.io.IOException;
   
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  @@ -34,16 +33,15 @@
    *
    * @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
    */
  -public 
  +public
   abstract class AbstractIpRestrictor extends AbstractLogEnabled
  -                                    implements IpRestrictorInterface, 
  -                                               Block,
  -                                               Contextualizable, 
  -                                               Serviceable, 
  -                                               Configurable, 
  +                                    implements IpRestrictorInterface,
  +                                               Contextualizable,
  +                                               Serviceable,
  +                                               Configurable,
                                                  Initializable,
                                                  Disposable {
  -   
  +
       protected Configuration mConfig;
       protected BlockContext mBlockContext;
       protected ServiceManager mServiceManager;
  @@ -54,7 +52,7 @@
        */
       public void contextualize(Context context) throws ContextException {
           mBlockContext = (BlockContext) context;
  -    } 
  +    }
   
       /**
        * Get block context.
  @@ -63,7 +61,7 @@
           return mBlockContext;
       }
   
  -    
  +
       /**
        * Set component manager - second step.
        */
  @@ -77,29 +75,29 @@
       public ServiceManager getServiceManager() {
           return mServiceManager;
       }
  -    
  +
   
       /**
        * Configure user manager - third step.
        */
       public void configure(Configuration config) throws ConfigurationException {
  -        mConfig = config;       
  +        mConfig = config;
   
  -        // get server address        
  -        Configuration tmpConf = mConfig.getChild("allow-ip", false); 
  -        mbAllowIp = false;       
  +        // get server address
  +        Configuration tmpConf = mConfig.getChild("allow-ip", false);
  +        mbAllowIp = false;
           if(tmpConf != null) {
               mbAllowIp = tmpConf.getValueAsBoolean(mbAllowIp);
  -        } 
  +        }
       }
  -     
  +
       /**
        * Get allow/ban IP flag.
        */
       public boolean isAllowIp() {
           return mbAllowIp;
       }
  -   
  +
       /**
        * Get config object.
        */
  @@ -126,5 +124,5 @@
       public void dispose() {
           getLogger().info("Closing ip restrictor...");
       }
  -        
  +
   }
  
  
  
  1.5       +16 -18    jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/AbstractUserManager.java
  
  Index: AbstractUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/AbstractUserManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractUserManager.java	12 May 2002 10:36:09 -0000	1.4
  +++ AbstractUserManager.java	18 May 2002 09:49:01 -0000	1.5
  @@ -8,7 +8,6 @@
    */
   package org.apache.avalon.ftpserver.usermanager;
   
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  @@ -32,27 +31,26 @@
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
    */
  -public 
  +public
   abstract class AbstractUserManager extends AbstractLogEnabled
  -                                   implements UserManagerInterface, 
  -                                              Block,
  -                                              Contextualizable, 
  -                                              Serviceable, 
  -                                              Configurable, 
  +                                   implements UserManagerInterface,
  +                                              Contextualizable,
  +                                              Serviceable,
  +                                              Configurable,
                                                 Initializable,
                                                 Disposable {
  -   
  +
       protected Configuration mConfig;
       protected BlockContext mBlockContext;
       protected ServiceManager mServiceManager;
       protected String mstAdminName;
  -    
  +
       /**
        * Set context object - first step.
        */
       public void contextualize(Context context) throws ContextException {
           mBlockContext = (BlockContext) context;
  -    } 
  +    }
   
       /**
        * Get block context.
  @@ -61,7 +59,7 @@
           return mBlockContext;
       }
   
  -    
  +
       /**
        * Set component manager - second step.
        */
  @@ -75,21 +73,21 @@
       public ServiceManager getServiceManager() {
           return mServiceManager;
       }
  -    
  +
   
       /**
        * Configure user manager - third step.
        */
       public void configure(Configuration config) throws ConfigurationException {
  -        mConfig = config;       
  -       
  -        Configuration adminConf = mConfig.getChild("ftp-admin-name", false);        
  +        mConfig = config;
  +
  +        Configuration adminConf = mConfig.getChild("ftp-admin-name", false);
           mstAdminName = "admin";
           if(adminConf != null) {
               mstAdminName = adminConf.getValue(mstAdminName);
           }
       }
  -        
  +
       /**
        * Get config object.
        */
  @@ -107,7 +105,7 @@
   
       /**
        * Reload user data - dummy implementation.
  -     */        
  +     */
       public void reload() throws Exception {
       }
   
  @@ -124,5 +122,5 @@
       public void dispose() {
           getLogger().info("Closing user manager...");
       }
  -    
  +
   }
  
  
  
  1.9       +1 -2      jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java
  
  Index: DefaultHypersonicSQL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultHypersonicSQL.java	14 May 2002 23:07:39 -0000	1.8
  +++ DefaultHypersonicSQL.java	18 May 2002 09:49:01 -0000	1.9
  @@ -28,7 +28,6 @@
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.hsql.services.HypersonicSQL;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.hsqldb.HsqlServerFactory;
   import org.hsqldb.HsqlSocketRequestHandler;
  @@ -39,7 +38,7 @@
    */
   public class DefaultHypersonicSQL
       extends AbstractLogEnabled
  -    implements Block, Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
  +    implements Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
   {
       protected SocketManager m_socketManager;
       protected ConnectionManager m_connectionManager;
  
  
  
  1.8       +1 -2      jakarta-avalon-apps/httpproxy/src/java/org/apache/avalon/httpproxy/AbstractHttpProxyServer.java
  
  Index: AbstractHttpProxyServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/src/java/org/apache/avalon/httpproxy/AbstractHttpProxyServer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractHttpProxyServer.java	12 May 2002 10:50:05 -0000	1.7
  +++ AbstractHttpProxyServer.java	18 May 2002 09:49:01 -0000	1.8
  @@ -23,7 +23,6 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
   import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
  @@ -38,7 +37,7 @@
   public abstract class AbstractHttpProxyServer
       extends AbstractLogEnabled
       implements Contextualizable, Serviceable, Configurable,
  -    Initializable, Disposable, Block, ConnectionHandlerFactory
  +    Initializable, Disposable, ConnectionHandlerFactory
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( AbstractHttpProxyServer.class );
  
  
  
  1.12      +1 -2      jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java
  
  Index: Overlord.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Overlord.java	15 May 2002 14:54:03 -0000	1.11
  +++ Overlord.java	18 May 2002 09:49:01 -0000	1.12
  @@ -27,7 +27,6 @@
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
   import org.apache.avalon.cornerstone.services.scheduler.TimeTrigger;
  @@ -40,7 +39,7 @@
    */
   public class Overlord
       extends AbstractLogEnabled
  -    implements Contextualizable, Serviceable, Configurable, Initializable, Disposable, Block, GatheringServer
  +    implements Contextualizable, Serviceable, Configurable, Initializable, Disposable, GatheringServer
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( Overlord.class );
  
  
  
  1.7       +1 -2      jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderServer.java
  
  Index: XCommanderServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderServer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XCommanderServer.java	14 May 2002 23:37:14 -0000	1.6
  +++ XCommanderServer.java	18 May 2002 09:49:01 -0000	1.7
  @@ -29,7 +29,6 @@
   import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
   import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
   import org.apache.avalon.cornerstone.services.sockets.SocketManager;
  -import org.apache.avalon.phoenix.Block;
   
   /**
    * A socket server which listens for XCommander requests.
  @@ -42,7 +41,7 @@
    */
   public class XCommanderServer
       extends AbstractLogEnabled
  -    implements Block, Serviceable, Configurable, Initializable,
  +    implements Serviceable, Configurable, Initializable,
                  ConnectionHandlerFactory, CommandHandler
   {
       // block stuff
  
  
  

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