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/client/impl/stream ClientObjectStreamReadWriter.java
Date Sun, 25 May 2003 17:28:14 GMT
hammant     2003/05/25 10:28:14

  Modified:    src/java/org/apache/altrmi/client/impl/piped
                        PipedObjectStreamInvocationHandler.java
               src/java/org/apache/altrmi/client/impl/socket
                        SocketObjectStreamHostContext.java
                        SocketObjectStreamInvocationHandler.java
               src/java/org/apache/altrmi/client/impl/stream
                        ClientObjectStreamReadWriter.java
  Log:
  More of getting rid of JSX capability
  
  Revision  Changes    Path
  1.4       +2 -2      incubator-altrmi/src/java/org/apache/altrmi/client/impl/piped/PipedObjectStreamInvocationHandler.java
  
  Index: PipedObjectStreamInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/client/impl/piped/PipedObjectStreamInvocationHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PipedObjectStreamInvocationHandler.java	17 Feb 2003 20:28:05 -0000	1.3
  +++ PipedObjectStreamInvocationHandler.java	25 May 2003 17:28:14 -0000	1.4
  @@ -110,6 +110,6 @@
       protected ClientStreamReadWriter createClientStreamReadWriter(
           InputStream in, OutputStream out ) throws ConnectionException
       {
  -        return new ClientObjectStreamReadWriter( in, out, null, null );
  +        return new ClientObjectStreamReadWriter( in, out );
       }
   }
  
  
  
  1.3       +3 -51     incubator-altrmi/src/java/org/apache/altrmi/client/impl/socket/SocketObjectStreamHostContext.java
  
  Index: SocketObjectStreamHostContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/client/impl/socket/SocketObjectStreamHostContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SocketObjectStreamHostContext.java	17 Feb 2003 20:28:05 -0000	1.2
  +++ SocketObjectStreamHostContext.java	25 May 2003 17:28:14 -0000	1.3
  @@ -73,8 +73,6 @@
   public class SocketObjectStreamHostContext extends AbstractSameVmBindableHostContext
   {
   
  -    private String m_objectOutputStreamClassName;
  -    private String m_objectInputStreamClassName;
       private int m_port;
   
       /**
  @@ -90,7 +88,7 @@
       public SocketObjectStreamHostContext( String host, int port ) throws ConnectionException
       {
   
  -        super( new SocketObjectStreamInvocationHandler( host, port, null, null,
  +        super( new SocketObjectStreamInvocationHandler( host, port,
                                                           SocketObjectStreamHostContext.class
                                                           .getClassLoader() ) );
           m_port = port;
  @@ -110,53 +108,7 @@
       public SocketObjectStreamHostContext( String host, int port, ClassLoader classLoader
)
           throws ConnectionException
       {
  -        super( new SocketObjectStreamInvocationHandler( host, port, null, null, classLoader
) );
  -        m_port = port;
  -    }
  -
  -    /**
  -     * Constructor SocketObjectStreamHostContext
  -     *
  -     *
  -     * @param host
  -     * @param port
  -     * @param objectInputStreamClassName
  -     * @param objectOutputStreamClassName
  -     *
  -     * @throws ConnectionException
  -     *
  -     */
  -    public SocketObjectStreamHostContext(
  -        String host, int port, String objectInputStreamClassName, String objectOutputStreamClassName
)
  -        throws ConnectionException
  -    {
  -
  -        super( new SocketObjectStreamInvocationHandler( host, port, objectInputStreamClassName,
  -                                                        objectOutputStreamClassName,
  -                                                        SocketObjectStreamHostContext.class
  -                                                        .getClassLoader() ) );
  -        m_port = port;
  -    }
  -
  -    /**
  -     * Constructor SocketObjectStreamHostContext
  -     *
  -     *
  -     * @param host
  -     * @param port
  -     * @param objectInputStreamClassName
  -     * @param objectOutputStreamClassName
  -     * @param classLoader
  -     *
  -     * @throws ConnectionException
  -     *
  -     */
  -    public SocketObjectStreamHostContext(
  -        String host, int port, String objectInputStreamClassName, String objectOutputStreamClassName,
ClassLoader classLoader )
  -        throws ConnectionException
  -    {
  -        super( new SocketObjectStreamInvocationHandler( host, port, objectInputStreamClassName,
  -                                                        objectOutputStreamClassName, classLoader
) );
  +        super( new SocketObjectStreamInvocationHandler( host, port, classLoader ) );
           m_port = port;
       }
   
  
  
  
  1.3       +3 -11     incubator-altrmi/src/java/org/apache/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java
  
  Index: SocketObjectStreamInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SocketObjectStreamInvocationHandler.java	17 Feb 2003 20:28:05 -0000	1.2
  +++ SocketObjectStreamInvocationHandler.java	25 May 2003 17:28:14 -0000	1.3
  @@ -71,24 +71,19 @@
       extends AbstractSocketStreamInvocationHandler
   {
   
  -    private String m_objectOutputStreamClassName;
  -    private String m_objectInputStreamClassName;
  -
       /**
        * Const a SocketObjectStreamInvocationHandler.
        *
        *
        * @param host the host
        * @param port the port
  -     * @param objectInputStreamClassName a classname for the input stream
  -     * @param objectOutputStreamClassName a classname for the output stream
        * @param classLoader a classloader for deserialization hints.
        *
        * @throws ConnectionException if a problem
        *
        */
       public SocketObjectStreamInvocationHandler(
  -        String host, int port, String objectInputStreamClassName, String objectOutputStreamClassName,
ClassLoader classLoader )
  +        String host, int port, ClassLoader classLoader )
           throws ConnectionException
       {
   
  @@ -96,8 +91,6 @@
   
           //TODO - is this a pending problem?  The superclass invokes createClientStreamReadWriter
           // perhaps an init() is needed.
  -        m_objectInputStreamClassName = objectInputStreamClassName;
  -        m_objectOutputStreamClassName = objectOutputStreamClassName;
       }
   
       /**
  @@ -110,7 +103,6 @@
       protected ClientStreamReadWriter createClientStreamReadWriter(
           InputStream in, OutputStream out ) throws ConnectionException
       {
  -        return new ClientObjectStreamReadWriter( in, out, m_objectOutputStreamClassName,
  -                                                 m_objectInputStreamClassName );
  +        return new ClientObjectStreamReadWriter( in, out );
       }
   }
  
  
  
  1.4       +2 -17     incubator-altrmi/src/java/org/apache/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java
  
  Index: ClientObjectStreamReadWriter.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/src/java/org/apache/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClientObjectStreamReadWriter.java	17 Feb 2003 20:28:06 -0000	1.3
  +++ ClientObjectStreamReadWriter.java	25 May 2003 17:28:14 -0000	1.4
  @@ -82,7 +82,6 @@
       private ObjectOutputStream m_objectOutputStream;
       private String m_objectOutputStreamClassName = "java.io.ObjectOutputStream";
       private String m_objectInputStreamClassName = "java.io.ObjectInputStream";
  -    private ClassLoader m_interfacesClassLoader;
   
       /**
        * Constructor ClientObjectStreamReadWriter
  @@ -90,27 +89,13 @@
        *
        * @param inputStream
        * @param outputStream
  -     * @param objectOutputStreamClassName
  -     * @param objectInputStreamClassName
  -     *
        * @throws ConnectionException
        *
        */
       public ClientObjectStreamReadWriter(
  -        InputStream inputStream, OutputStream outputStream,
  -        String objectOutputStreamClassName, String objectInputStreamClassName)
  +        InputStream inputStream, OutputStream outputStream)
           throws ConnectionException
       {
  -
  -        if( objectOutputStreamClassName != null )
  -        {
  -            m_objectOutputStreamClassName = objectOutputStreamClassName;
  -        }
  -
  -        if( objectInputStreamClassName != null )
  -        {
  -            m_objectInputStreamClassName = objectInputStreamClassName;
  -        }
   
           try
           {
  
  
  

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


Mime
View raw message