incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket AbstractCompleteSocketStreamServer.java AbstractPartialSocketStreamServer.java CompleteCustomStreamPipedServer.java CompleteSocketCustomStreamPipedBinder.java CompleteSocketCustomStreamPipedConnection.java CompleteSocketCustomStreamServer.java CompleteSocketObjectStreamPipedBinder.java CompleteSocketObjectStreamPipedConnection.java CompleteSocketObjectStreamServer.java PartialSocketCustomStreamServer.java PartialSocketObjectStreamServer.java
Date Tue, 19 Aug 2003 21:24:10 GMT
hammant     2003/08/19 14:24:10

  Modified:    src/java/org/apache/altrmi/blocks/publishing
                        RmiPublisher.java
               src/java/org/apache/altrmi/server Publisher.java
               src/java/org/apache/altrmi/server/impl AbstractServer.java
               src/java/org/apache/altrmi/server/impl/betwixt
                        CompleteBetwixtServer.java
               src/java/org/apache/altrmi/server/impl/callback/socket
                        CallbackEnabledSocketCustomStreamServer.java
                        PartialCallbackEnabledSocketCustomStreamServer.java
               src/java/org/apache/altrmi/server/impl/direct
                        DirectMarshalledServer.java DirectServer.java
               src/java/org/apache/altrmi/server/impl/messenger
                        SynchronousMessengerServer.java
               src/java/org/apache/altrmi/server/impl/piped
                        AbstractPipedServer.java
                        PipedCustomStreamServer.java
                        PipedObjectStreamServer.java
               src/java/org/apache/altrmi/server/impl/rmi RmiServer.java
               src/java/org/apache/altrmi/server/impl/socket
                        AbstractCompleteSocketStreamServer.java
                        AbstractPartialSocketStreamServer.java
                        CompleteCustomStreamPipedServer.java
                        CompleteSocketCustomStreamPipedBinder.java
                        CompleteSocketCustomStreamPipedConnection.java
                        CompleteSocketCustomStreamServer.java
                        CompleteSocketObjectStreamPipedBinder.java
                        CompleteSocketObjectStreamPipedConnection.java
                        CompleteSocketObjectStreamServer.java
                        PartialSocketCustomStreamServer.java
                        PartialSocketObjectStreamServer.java
  Log:
  rename internal impl classes from 'adaptor' to 'adapter' as per Sun usage of English
  
  Revision  Changes    Path
  1.5       +2 -2      incubator-altrmi/src/java/org/apache/altrmi/blocks/publishing/RmiPublisher.java
  
  Index: RmiPublisher.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/blocks/publishing/RmiPublisher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RmiPublisher.java	15 Jul 2003 07:08:09 -0000	1.4
  +++ RmiPublisher.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -102,7 +102,7 @@
           LogEnabledServerMonitor sm = new LogEnabledServerMonitor(getLogger());
   
           //TODO-PH-NOW
  -        //setAbstractServer( new RmiServer( new InvocationHandlerAdaptor(cr,aa,sm,ccf),
sm,  m_host, m_port ) );
  +        //setAbstractServer( new RmiServer( new InvocationHandlerAdapter(cr,aa,sm,ccf),
sm,  m_host, m_port ) );
   
           setupLogger( getAbstractServer() );
           super.initialize();
  
  
  
  1.4       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/Publisher.java
  
  Index: Publisher.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/Publisher.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Publisher.java	17 Feb 2003 20:28:38 -0000	1.3
  +++ Publisher.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -118,7 +118,7 @@
           throws PublicationException;
   
       /**
  -     * Get the MethodInvocationHandler for this transport.  Used in special adaptors.
  +     * Get the MethodInvocationHandler for this transport.  Used in special adapters.
        *
        *
        * @param methodRequest used as a hint for getting the right handler.
  @@ -131,7 +131,7 @@
                                                           String objectName );
   
       /**
  -     * Get the MethodInvocationHandler for a published lookup name. Used in special adaptors.
  +     * Get the MethodInvocationHandler for a published lookup name. Used in special adapters.
        *
        *
        * @param publishedName the published lookup name.
  
  
  
  1.6       +16 -16    incubator-altrmi/src/java/org/apache/altrmi/server/impl/AbstractServer.java
  
  Index: AbstractServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/AbstractServer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractServer.java	15 Jul 2003 07:10:04 -0000	1.5
  +++ AbstractServer.java	19 Aug 2003 21:24:09 -0000	1.6
  @@ -67,7 +67,7 @@
   import org.apache.altrmi.server.ServerConnection;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   
   import java.util.Vector;
   
  @@ -91,7 +91,7 @@
       /**
        * The invocation handler
        */
  -    private InvocationHandlerAdaptor m_invocationHandlerAdaptor;
  +    private InvocationHandlerAdapter m_invocationHandlerAdapter;
   
       /**
        * The state of the system.
  @@ -110,10 +110,10 @@
        * @param serverMonitor The Server monitor
        *
        */
  -    public AbstractServer( InvocationHandlerAdaptor invocationHandlerAdapter, ServerMonitor
serverMonitor,
  +    public AbstractServer( InvocationHandlerAdapter invocationHandlerAdapter, ServerMonitor
serverMonitor,
                              ThreadPool threadPool, ServerSideClientContextFactory contextFactory
)
       {
  -        m_invocationHandlerAdaptor = invocationHandlerAdapter;
  +        m_invocationHandlerAdapter = invocationHandlerAdapter;
           m_serverMonitor = serverMonitor;
           m_threadPool = threadPool;
           m_contextFactory = contextFactory;
  @@ -138,7 +138,7 @@
        */
       public Reply handleInvocation( Request request, Object connectionDetails )
       {
  -        return m_invocationHandlerAdaptor.handleInvocation( request, connectionDetails
);
  +        return m_invocationHandlerAdapter.handleInvocation( request, connectionDetails
);
       }
   
       /**
  @@ -147,7 +147,7 @@
        */
       public void suspend()
       {
  -        m_invocationHandlerAdaptor.suspend();
  +        m_invocationHandlerAdapter.suspend();
       }
   
       /**
  @@ -156,7 +156,7 @@
        */
       public void resume()
       {
  -        m_invocationHandlerAdaptor.resume();
  +        m_invocationHandlerAdapter.resume();
       }
   
       /**
  @@ -207,7 +207,7 @@
       public void publish( Object impl, String asName, Class interfaceToExpose )
           throws PublicationException
       {
  -        m_invocationHandlerAdaptor.publish( impl, asName, interfaceToExpose );
  +        m_invocationHandlerAdapter.publish( impl, asName, interfaceToExpose );
       }
   
       /**
  @@ -223,7 +223,7 @@
       public void publish( Object impl, String asName, PublicationDescription publicationDescription
)
           throws PublicationException
       {
  -        m_invocationHandlerAdaptor.publish( impl, asName, publicationDescription );
  +        m_invocationHandlerAdapter.publish( impl, asName, publicationDescription );
       }
   
       /**
  @@ -237,7 +237,7 @@
        */
       public void unPublish( Object impl, String asName ) throws PublicationException
       {
  -        m_invocationHandlerAdaptor.unPublish( impl, asName );
  +        m_invocationHandlerAdapter.unPublish( impl, asName );
       }
   
       /**
  @@ -253,7 +253,7 @@
       public void replacePublished( Object oldImpl, String publishedName, Object withImpl
)
           throws PublicationException
       {
  -        m_invocationHandlerAdaptor.replacePublished( oldImpl, publishedName, withImpl );
  +        m_invocationHandlerAdapter.replacePublished( oldImpl, publishedName, withImpl );
       }
   
       /**
  @@ -269,7 +269,7 @@
       public MethodInvocationHandler getMethodInvocationHandler( MethodRequest methodRequest,
                                                                  String objectName )
       {
  -        return m_invocationHandlerAdaptor.getMethodInvocationHandler( methodRequest, objectName
);
  +        return m_invocationHandlerAdapter.getMethodInvocationHandler( methodRequest, objectName
);
       }
   
       /**
  @@ -283,16 +283,16 @@
        */
       public MethodInvocationHandler getMethodInvocationHandler( String publishedName )
       {
  -        return m_invocationHandlerAdaptor.getMethodInvocationHandler( publishedName );
  +        return m_invocationHandlerAdapter.getMethodInvocationHandler( publishedName );
       }
   
       /**
        * Get the Invocation Handler Adapter.
        * @return the invocation handler adapter.
        */
  -    public InvocationHandlerAdaptor getInovcationHandlerAdapter()
  +    public InvocationHandlerAdapter getInovcationHandlerAdapter()
       {
  -        return m_invocationHandlerAdaptor;
  +        return m_invocationHandlerAdapter;
       }
   
   
  
  
  
  1.3       +2 -2      incubator-altrmi/src/java/org/apache/altrmi/server/impl/betwixt/CompleteBetwixtServer.java
  
  Index: CompleteBetwixtServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/betwixt/CompleteBetwixtServer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CompleteBetwixtServer.java	15 Jul 2003 07:10:05 -0000	1.2
  +++ CompleteBetwixtServer.java	19 Aug 2003 21:24:09 -0000	1.3
  @@ -65,7 +65,7 @@
   import org.apache.altrmi.server.impl.DefaultServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   import org.apache.altrmi.server.impl.socket.AbstractCompleteSocketStreamServer;
   import org.apache.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
  @@ -87,7 +87,7 @@
               ServerSideClientContextFactory contextFactory,
               int port)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.4       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamServer.java
  
  Index: CallbackEnabledSocketCustomStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CallbackEnabledSocketCustomStreamServer.java	15 Jul 2003 07:10:05 -0000	1.3
  +++ CallbackEnabledSocketCustomStreamServer.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -64,7 +64,7 @@
   import org.apache.altrmi.server.impl.DefaultServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.callback.stream.CallbackEnabledCustomStreamReadWriter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   import org.apache.altrmi.server.impl.socket.AbstractCompleteSocketStreamServer;
  @@ -101,7 +101,7 @@
               ServerSideClientContextFactory contextFactory,
               int port)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.4       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/callback/socket/PartialCallbackEnabledSocketCustomStreamServer.java
  
  Index: PartialCallbackEnabledSocketCustomStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/callback/socket/PartialCallbackEnabledSocketCustomStreamServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PartialCallbackEnabledSocketCustomStreamServer.java	15 Jul 2003 07:10:05 -0000	1.3
  +++ PartialCallbackEnabledSocketCustomStreamServer.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -56,7 +56,7 @@
   
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
   import org.apache.altrmi.server.impl.callback.stream.CallbackEnabledCustomStreamReadWriter;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.socket.AbstractPartialSocketStreamServer;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
  @@ -81,7 +81,7 @@
        * @param serverMonitor
        *
        */
  -    public PartialCallbackEnabledSocketCustomStreamServer(InvocationHandlerAdaptor invocationHandlerAdapter,
  +    public PartialCallbackEnabledSocketCustomStreamServer(InvocationHandlerAdapter invocationHandlerAdapter,
                                                             ServerMonitor serverMonitor,
ThreadPool threadPool,
                                                             ServerSideClientContextFactory
contextFactory)
       {
  
  
  
  1.7       +6 -6      incubator-altrmi/src/java/org/apache/altrmi/server/impl/direct/DirectMarshalledServer.java
  
  Index: DirectMarshalledServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/direct/DirectMarshalledServer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DirectMarshalledServer.java	3 Aug 2003 22:38:48 -0000	1.6
  +++ DirectMarshalledServer.java	19 Aug 2003 21:24:09 -0000	1.7
  @@ -68,8 +68,8 @@
   import org.apache.altrmi.server.impl.DefaultServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  -import org.apache.altrmi.server.impl.adaptors.MarshalledInvocationHandlerAdapter;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
  +import org.apache.altrmi.server.impl.adapters.MarshalledInvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   
   /**
  @@ -86,7 +86,7 @@
       private final MarshalledInvocationHandlerAdapter m_marshalledInvocationHandlerAdapter;
   
       /**
  -     * Constructor DirectMarshalledServer for use with pre-exiting InvocationHandlerAdaptor
and MarshalledInvocationHandler
  +     * Constructor DirectMarshalledServer for use with pre-exiting InvocationHandlerAdapter
and MarshalledInvocationHandler
        *
        * @param classRetriever
        * @param authenticator
  @@ -105,7 +105,7 @@
               MarshalledInvocationHandlerAdapter marshalledInvocationHandlerAdapter)
       {
           super(
  -                new InvocationHandlerAdaptor(
  +                new InvocationHandlerAdapter(
                           classRetriever,
                           authenticator,
                           serverMonitor,
  @@ -124,7 +124,7 @@
                       new NullServerMonitor(),
                       new DefaultThreadPool(),
                       new DefaultServerSideClientContextFactory(), new MarshalledInvocationHandlerAdapter(
  -                            new InvocationHandlerAdaptor(new NoClassRetriever(),
  +                            new InvocationHandlerAdapter(new NoClassRetriever(),
                                       new DefaultAuthenticator(), new NullServerMonitor(),
                                       new DefaultServerSideClientContextFactory()))
               );
  
  
  
  1.6       +4 -4      incubator-altrmi/src/java/org/apache/altrmi/server/impl/direct/DirectServer.java
  
  Index: DirectServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/direct/DirectServer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DirectServer.java	15 Jul 2003 07:10:06 -0000	1.5
  +++ DirectServer.java	19 Aug 2003 21:24:09 -0000	1.6
  @@ -67,7 +67,7 @@
   import org.apache.altrmi.server.impl.DefaultServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   
   /**
  @@ -81,7 +81,7 @@
   {
   
       /**
  -     * Constructor DirectServer for use with pre-exiting InvocationHandlerAdaptor.
  +     * Constructor DirectServer for use with pre-exiting InvocationHandlerAdapter.
        *
        * @param classRetriever
        * @param authenticator
  @@ -97,7 +97,7 @@
               ThreadPool threadPool,
               ServerSideClientContextFactory contextFactory)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.10      +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/messenger/SynchronousMessengerServer.java
  
  Index: SynchronousMessengerServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/messenger/SynchronousMessengerServer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SynchronousMessengerServer.java	15 Jul 2003 07:10:06 -0000	1.9
  +++ SynchronousMessengerServer.java	19 Aug 2003 21:24:09 -0000	1.10
  @@ -69,7 +69,7 @@
   import org.apache.altrmi.server.impl.DefaultServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   import org.apache.altrmi.server.impl.socket.CompleteSocketObjectStreamServer;
   import org.apache.commons.messenger.Messenger;
  @@ -101,7 +101,7 @@
               ServerSideClientContextFactory contextFactory,
               Messenger messenger, String subject)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.4       +4 -4      incubator-altrmi/src/java/org/apache/altrmi/server/impl/piped/AbstractPipedServer.java
  
  Index: AbstractPipedServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/piped/AbstractPipedServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractPipedServer.java	15 Jul 2003 07:10:06 -0000	1.3
  +++ AbstractPipedServer.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -62,7 +62,7 @@
   import org.apache.altrmi.common.ThreadPool;
   import org.apache.altrmi.server.impl.AbstractServer;
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.server.ClassRetriever;
  @@ -82,11 +82,11 @@
                                  ThreadPool threadPool,
                                  ServerSideClientContextFactory contextFactory)
       {
  -        super(new InvocationHandlerAdaptor(classRetriever, authenticator, serverMonitor,
contextFactory),
  +        super(new InvocationHandlerAdapter(classRetriever, authenticator, serverMonitor,
contextFactory),
                   serverMonitor, threadPool, contextFactory);
       }
   
  -    public AbstractPipedServer(InvocationHandlerAdaptor invocationHandlerAdapter, ServerMonitor
serverMonitor,
  +    public AbstractPipedServer(InvocationHandlerAdapter invocationHandlerAdapter, ServerMonitor
serverMonitor,
                                  ThreadPool threadPool,
                                  ServerSideClientContextFactory contextFactory)
       {
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/piped/PipedCustomStreamServer.java
  
  Index: PipedCustomStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/piped/PipedCustomStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PipedCustomStreamServer.java	15 Jul 2003 07:10:06 -0000	1.4
  +++ PipedCustomStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -65,7 +65,7 @@
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.ServerCustomStreamReadWriter;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   
   /**
  @@ -95,7 +95,7 @@
               ThreadPool threadPool,
               ServerSideClientContextFactory contextFactory)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/piped/PipedObjectStreamServer.java
  
  Index: PipedObjectStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/piped/PipedObjectStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PipedObjectStreamServer.java	15 Jul 2003 07:10:06 -0000	1.4
  +++ PipedObjectStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -65,7 +65,7 @@
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.ServerObjectStreamReadWriter;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   
   /**
  @@ -95,7 +95,7 @@
               ThreadPool threadPool,
               ServerSideClientContextFactory contextFactory)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.5       +6 -6      incubator-altrmi/src/java/org/apache/altrmi/server/impl/rmi/RmiServer.java
  
  Index: RmiServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/rmi/RmiServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RmiServer.java	3 Aug 2003 22:37:30 -0000	1.4
  +++ RmiServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -66,7 +66,7 @@
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
   import org.apache.altrmi.server.impl.DefaultServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.NullServerMonitor;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.PlainClassRetriever;
   
   import java.rmi.NotBoundException;
  @@ -102,18 +102,18 @@
       /**
        * Constructor a RmiServer with a preexiting invocation handler.
        *
  -     * @param invocationHandlerAdaptor
  +     * @param invocationHandlerAdapter
        * @param serverMonitor
        * @param threadPool
        * @param contextFactory
        * @param port
        */
  -    public RmiServer(InvocationHandlerAdaptor invocationHandlerAdaptor,
  +    public RmiServer(InvocationHandlerAdapter invocationHandlerAdapter,
                        ServerMonitor serverMonitor,
                        ThreadPool threadPool, ServerSideClientContextFactory contextFactory,
                        int port)
       {
  -        super(invocationHandlerAdaptor, serverMonitor, threadPool, contextFactory);
  +        super(invocationHandlerAdapter, serverMonitor, threadPool, contextFactory);
           m_port = port;
       }
   
  @@ -133,7 +133,7 @@
                        ThreadPool threadPool, ServerSideClientContextFactory contextFactory,
                        int port)
   		{
  -            super(new InvocationHandlerAdaptor(classRetriever, authenticator,serverMonitor,
contextFactory),
  +            super(new InvocationHandlerAdapter(classRetriever, authenticator,serverMonitor,
contextFactory),
                   serverMonitor, threadPool, contextFactory, port);
   		}
   	}
  
  
  
  1.8       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/AbstractCompleteSocketStreamServer.java
  
  Index: AbstractCompleteSocketStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/AbstractCompleteSocketStreamServer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractCompleteSocketStreamServer.java	15 Jul 2003 07:10:07 -0000	1.7
  +++ AbstractCompleteSocketStreamServer.java	19 Aug 2003 21:24:09 -0000	1.8
  @@ -62,7 +62,7 @@
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.AbstractServer;
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.common.AltrmiRuntimeException;
   import org.apache.altrmi.common.ThreadContext;
   import org.apache.altrmi.common.ThreadPool;
  @@ -103,7 +103,7 @@
        *
        */
       public AbstractCompleteSocketStreamServer(
  -        InvocationHandlerAdaptor invocationHandlerAdapter,
  +        InvocationHandlerAdapter invocationHandlerAdapter,
           ServerMonitor serverMonitor,
           ThreadPool threadPool,
           ServerSideClientContextFactory contextFactory,
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/AbstractPartialSocketStreamServer.java
  
  Index: AbstractPartialSocketStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/AbstractPartialSocketStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractPartialSocketStreamServer.java	15 Jul 2003 07:10:07 -0000	1.4
  +++ AbstractPartialSocketStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -60,7 +60,7 @@
   import java.net.SocketException;
   import org.apache.altrmi.server.impl.AbstractServer;
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.common.ThreadPool;
  @@ -77,7 +77,7 @@
        * @param invocationHandlerAdapter Use this invocation handler adapter.
        * @param serverMonitor The server Monitor
        */
  -    public AbstractPartialSocketStreamServer( InvocationHandlerAdaptor invocationHandlerAdapter,
  +    public AbstractPartialSocketStreamServer( InvocationHandlerAdapter invocationHandlerAdapter,
                                                 ServerMonitor serverMonitor, ThreadPool threadPool,
ServerSideClientContextFactory contextFactory )
       {
           super( invocationHandlerAdapter, serverMonitor, threadPool, contextFactory);
  
  
  
  1.2       +2 -2      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteCustomStreamPipedServer.java
  
  Index: CompleteCustomStreamPipedServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteCustomStreamPipedServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompleteCustomStreamPipedServer.java	15 Jul 2003 07:10:07 -0000	1.1
  +++ CompleteCustomStreamPipedServer.java	19 Aug 2003 21:24:09 -0000	1.2
  @@ -2,7 +2,7 @@
   
   import org.apache.altrmi.server.impl.piped.PipedCustomStreamServer;
   import org.apache.altrmi.server.impl.piped.AbstractPipedServer;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
   import org.apache.altrmi.server.impl.ServerCustomStreamReadWriter;
   import org.apache.altrmi.server.ServerMonitor;
  @@ -12,7 +12,7 @@
   
   public class CompleteCustomStreamPipedServer extends AbstractPipedServer
   {
  -    public CompleteCustomStreamPipedServer(InvocationHandlerAdaptor invocationHandlerAdapter,
ServerMonitor serverMonitor,
  +    public CompleteCustomStreamPipedServer(InvocationHandlerAdapter invocationHandlerAdapter,
ServerMonitor serverMonitor,
                                  ThreadPool threadPool,
                                  ServerSideClientContextFactory contextFactory)
       {
  
  
  
  1.4       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketCustomStreamPipedBinder.java
  
  Index: CompleteSocketCustomStreamPipedBinder.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketCustomStreamPipedBinder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompleteSocketCustomStreamPipedBinder.java	15 Jul 2003 07:10:07 -0000	1.3
  +++ CompleteSocketCustomStreamPipedBinder.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -54,7 +54,7 @@
    */
   package org.apache.altrmi.server.impl.socket;
   
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.registry.Binder;
  @@ -74,7 +74,7 @@
   public class CompleteSocketCustomStreamPipedBinder implements Binder
    {
   
  -    private InvocationHandlerAdaptor m_invocationHandlerAdapter;
  +    private InvocationHandlerAdapter m_invocationHandlerAdapter;
       private final ServerMonitor m_serverMonitor;
       private final ThreadPool m_threadPool;
       private final ServerSideClientContextFactory m_contextFactory;
  @@ -84,7 +84,7 @@
        * Construuct a Piped Binder
        * @param invocationHandlerAdapter An invocation handler adapter to handle requests
        */
  -    public CompleteSocketCustomStreamPipedBinder(InvocationHandlerAdaptor invocationHandlerAdapter,
  +    public CompleteSocketCustomStreamPipedBinder(InvocationHandlerAdapter invocationHandlerAdapter,
                                                    ServerMonitor serverMonitor, ThreadPool
threadPool,
                                                    ServerSideClientContextFactory contextFactory)
       {
  
  
  
  1.4       +4 -4      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketCustomStreamPipedConnection.java
  
  Index: CompleteSocketCustomStreamPipedConnection.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketCustomStreamPipedConnection.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompleteSocketCustomStreamPipedConnection.java	15 Jul 2003 07:10:07 -0000	1.3
  +++ CompleteSocketCustomStreamPipedConnection.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -56,7 +56,7 @@
   
   import org.apache.altrmi.server.impl.piped.PipedCustomStreamServer;
   import org.apache.altrmi.server.impl.piped.AbstractPipedServer;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.server.ClassRetriever;
  @@ -80,7 +80,7 @@
   
       /**
        * Create a Complete Socket CustomStream Piped Connection
  -     * @param invocationHandlerAdaptor the invocation adapter from the SocketCustomStream
  +     * @param invocationHandlerAdapter the invocation adapter from the SocketCustomStream
        * @param completeSocketCustomStreamPipedBinder The binder that controls this connection
        * @param inputStream the piped input stream
        * @param outputStream the piped output stream
  @@ -88,14 +88,14 @@
        */
       public CompleteSocketCustomStreamPipedConnection
               (
  -            InvocationHandlerAdaptor invocationHandlerAdaptor,
  +            InvocationHandlerAdapter invocationHandlerAdapter,
               CompleteSocketCustomStreamPipedBinder completeSocketCustomStreamPipedBinder,
               PipedInputStream inputStream,
               PipedOutputStream outputStream,
               ThreadPool threadPool, ServerSideClientContextFactory contextFactory,
               ServerMonitor serverMonitor) throws ConnectionException
       {
  -        m_pipedCustomStreamServer = new CompleteCustomStreamPipedServer(invocationHandlerAdaptor,serverMonitor,
  +        m_pipedCustomStreamServer = new CompleteCustomStreamPipedServer(invocationHandlerAdapter,serverMonitor,
                   threadPool,contextFactory);
           m_pipedCustomStreamServer.start();
           m_completeSocketCustomStreamPipedBinder = completeSocketCustomStreamPipedBinder;
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketCustomStreamServer.java
  
  Index: CompleteSocketCustomStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketCustomStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompleteSocketCustomStreamServer.java	15 Jul 2003 07:10:07 -0000	1.4
  +++ CompleteSocketCustomStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -65,7 +65,7 @@
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.ServerCustomStreamReadWriter;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   
   /**
  @@ -97,7 +97,7 @@
               ServerSideClientContextFactory contextFactory,
               int port)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.4       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketObjectStreamPipedBinder.java
  
  Index: CompleteSocketObjectStreamPipedBinder.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketObjectStreamPipedBinder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompleteSocketObjectStreamPipedBinder.java	15 Jul 2003 07:10:07 -0000	1.3
  +++ CompleteSocketObjectStreamPipedBinder.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -54,7 +54,7 @@
    */
   package org.apache.altrmi.server.impl.socket;
   
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.registry.Binder;
  @@ -74,7 +74,7 @@
   public class CompleteSocketObjectStreamPipedBinder implements Binder
   {
   
  -    private InvocationHandlerAdaptor m_invocationHandlerAdapter;
  +    private InvocationHandlerAdapter m_invocationHandlerAdapter;
       private final ServerMonitor m_serverMonitor;
       private final ThreadPool m_threadPool;
       private final ServerSideClientContextFactory m_contextFactory;
  @@ -84,7 +84,7 @@
        * Construuct a Piped Binder
        * @param invocationHandlerAdapter An invocation handler adapter to handle requests
        */
  -    public CompleteSocketObjectStreamPipedBinder(InvocationHandlerAdaptor invocationHandlerAdapter,
  +    public CompleteSocketObjectStreamPipedBinder(InvocationHandlerAdapter invocationHandlerAdapter,
                                                    ServerMonitor serverMonitor, ThreadPool
threadPool,
                                                    ServerSideClientContextFactory contextFactory)
       {
  
  
  
  1.4       +2 -2      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketObjectStreamPipedConnection.java
  
  Index: CompleteSocketObjectStreamPipedConnection.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketObjectStreamPipedConnection.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompleteSocketObjectStreamPipedConnection.java	15 Jul 2003 07:10:07 -0000	1.3
  +++ CompleteSocketObjectStreamPipedConnection.java	19 Aug 2003 21:24:09 -0000	1.4
  @@ -58,7 +58,7 @@
   import org.apache.altrmi.common.ThreadPool;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   
   import java.io.PipedInputStream;
   import java.io.PipedOutputStream;
  @@ -84,7 +84,7 @@
        */
       public CompleteSocketObjectStreamPipedConnection
               (
  -            InvocationHandlerAdaptor invocationHandlerAdapter,
  +            InvocationHandlerAdapter invocationHandlerAdapter,
               CompleteSocketObjectStreamPipedBinder completeSocketObjectStreamPipedBinder,
               ServerMonitor serverMonitor,
               ThreadPool threadPool,
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketObjectStreamServer.java
  
  Index: CompleteSocketObjectStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/CompleteSocketObjectStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompleteSocketObjectStreamServer.java	15 Jul 2003 07:10:07 -0000	1.4
  +++ CompleteSocketObjectStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -65,7 +65,7 @@
   import org.apache.altrmi.server.impl.NullServerMonitor;
   import org.apache.altrmi.server.impl.ServerObjectStreamReadWriter;
   import org.apache.altrmi.server.impl.DefaultAuthenticator;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.impl.classretrievers.NoClassRetriever;
   
   
  @@ -96,7 +96,7 @@
               ServerSideClientContextFactory contextFactory,
               int port)
       {
  -        super(new InvocationHandlerAdaptor(
  +        super(new InvocationHandlerAdapter(
                   classRetriever,
                   authenticator,
                   serverMonitor,
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/PartialSocketCustomStreamServer.java
  
  Index: PartialSocketCustomStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/PartialSocketCustomStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PartialSocketCustomStreamServer.java	15 Jul 2003 07:10:07 -0000	1.4
  +++ PartialSocketCustomStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -56,7 +56,7 @@
   
   import org.apache.altrmi.server.impl.ServerCustomStreamReadWriter;
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   import org.apache.altrmi.server.ServerException;
   import org.apache.altrmi.server.ServerMonitor;
   import org.apache.altrmi.server.ServerSideClientContextFactory;
  @@ -83,7 +83,7 @@
        * @param serverMonitor the monitor
        * @param port ther port
        */
  -    public PartialSocketCustomStreamServer(InvocationHandlerAdaptor invocationHandlerAdapter,
  +    public PartialSocketCustomStreamServer(InvocationHandlerAdapter invocationHandlerAdapter,
                                              ServerMonitor serverMonitor, ThreadPool threadPool,
                                              ServerSideClientContextFactory contextFactory,
int port)
       {
  
  
  
  1.5       +3 -3      incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/PartialSocketObjectStreamServer.java
  
  Index: PartialSocketObjectStreamServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/server/impl/socket/PartialSocketObjectStreamServer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PartialSocketObjectStreamServer.java	15 Jul 2003 07:10:07 -0000	1.4
  +++ PartialSocketObjectStreamServer.java	19 Aug 2003 21:24:09 -0000	1.5
  @@ -60,7 +60,7 @@
   import org.apache.altrmi.server.ServerSideClientContextFactory;
   import org.apache.altrmi.server.impl.AbstractServerStreamReadWriter;
   import org.apache.altrmi.server.impl.ServerObjectStreamReadWriter;
  -import org.apache.altrmi.server.impl.adaptors.InvocationHandlerAdaptor;
  +import org.apache.altrmi.server.impl.adapters.InvocationHandlerAdapter;
   
   
   /**
  @@ -84,7 +84,7 @@
        * @param serverMonitor the monitor
        * @param port ther port
        */
  -    public PartialSocketObjectStreamServer(InvocationHandlerAdaptor invocationHandlerAdapter,
  +    public PartialSocketObjectStreamServer(InvocationHandlerAdapter invocationHandlerAdapter,
                                              ServerMonitor serverMonitor,
                                              ThreadPool threadPool,
                                              ServerSideClientContextFactory contextFactory,
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message