avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server CMDConnectionHandler.java
Date Mon, 03 Mar 2003 16:40:32 GMT
bloritsch    2003/03/03 08:40:32

  Modified:    db/src/java/org/apache/avalon/db/transport/altrmi/client
                        AltrmiConnection.java
               db/src/java/org/apache/avalon/db/transport/altrmi/server
                        AltrmiDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/cmdstream/client
                        CommandConnection.java
               db/src/java/org/apache/avalon/db/transport/cmdstream/server
                        CMDConnectionHandler.java
  Log:
  organize imports and upgrade altrmi refs
  
  Revision  Changes    Path
  1.13      +14 -15    avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/client/AltrmiConnection.java
  
  Index: AltrmiConnection.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/client/AltrmiConnection.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AltrmiConnection.java	12 Jan 2003 10:19:07 -0000	1.12
  +++ AltrmiConnection.java	3 Mar 2003 16:40:32 -0000	1.13
  @@ -8,24 +8,23 @@
    */
   package org.apache.avalon.db.transport.altrmi.client;
   
  -import java.io.IOException;
  +import java.sql.SQLException;
  +
  +import org.apache.altrmi.client.Factory;
  +import org.apache.altrmi.client.HostContext;
  +import org.apache.altrmi.client.impl.ClientSideClassFactory;
  +import org.apache.altrmi.client.impl.rmi.RmiHostContext;
  +import org.apache.altrmi.client.impl.socket.SocketObjectStreamHostContext;
  +import org.apache.altrmi.common.ConnectionException;
  +import org.apache.altrmi.common.InvocationException;
  +import org.apache.avalon.db.common.AvalonDBSQLException;
   import org.apache.avalon.db.driver.AvalonDBConnection;
   import org.apache.avalon.db.services.DatabaseManager;
  -import org.apache.avalon.db.utils.StringUtils;
  -import org.apache.avalon.db.common.AvalonDBSQLException;
  -import org.apache.avalon.db.transport.Reply;
  -import org.apache.avalon.db.transport.Request;
   import org.apache.avalon.db.transport.EstablishConnectionReply;
   import org.apache.avalon.db.transport.EstablishConnectionRequest;
  -import org.apache.excalibur.altrmi.client.HostContext;
  -import org.apache.excalibur.altrmi.client.Factory;
  -import org.apache.excalibur.altrmi.client.impl.rmi.RmiHostContext;
  -import org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
  -import org.apache.excalibur.altrmi.client.impl.ClientSideClassFactory;
  -import org.apache.excalibur.altrmi.common.ConnectionException;
  -import org.apache.excalibur.altrmi.common.InvocationException;
  -
  -import java.sql.SQLException;
  +import org.apache.avalon.db.transport.Reply;
  +import org.apache.avalon.db.transport.Request;
  +import org.apache.avalon.db.utils.StringUtils;
   
   
   /**
  
  
  
  1.8       +1 -1      avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java
  
  Index: AltrmiDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AltrmiDatabaseManager.java	5 Jan 2003 23:25:28 -0000	1.7
  +++ AltrmiDatabaseManager.java	3 Mar 2003 16:40:32 -0000	1.8
  @@ -15,7 +15,7 @@
   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.Publisher;
  +import org.apache.altrmi.server.Publisher;
   
   /**
    *
  
  
  
  1.14      +11 -15    avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/client/CommandConnection.java
  
  Index: CommandConnection.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/client/CommandConnection.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CommandConnection.java	30 Nov 2001 12:09:10 -0000	1.13
  +++ CommandConnection.java	3 Mar 2003 16:40:32 -0000	1.14
  @@ -10,23 +10,19 @@
   
   
   
  -import org.apache.avalon.db.transport.Request;
  -import org.apache.avalon.db.transport.Reply;
  -import org.apache.avalon.db.transport.EstablishConnectionRequest;
  -import org.apache.avalon.db.transport.EstablishConnectionReply;
  -import org.apache.avalon.db.common.AvalonDBSQLException;
  -import org.apache.avalon.db.driver.AvalonDBConnection;
  -
  -import java.net.URL;
  +import java.io.IOException;
  +import java.io.ObjectInputStream;
  +import java.io.ObjectOutputStream;
   import java.net.Socket;
   import java.net.UnknownHostException;
  -
  -import java.io.ObjectOutputStream;
  -import java.io.ObjectInputStream;
  -import java.io.IOException;
  -import java.io.OptionalDataException;
  -
   import java.sql.SQLException;
  +
  +import org.apache.avalon.db.common.AvalonDBSQLException;
  +import org.apache.avalon.db.driver.AvalonDBConnection;
  +import org.apache.avalon.db.transport.EstablishConnectionReply;
  +import org.apache.avalon.db.transport.EstablishConnectionRequest;
  +import org.apache.avalon.db.transport.Reply;
  +import org.apache.avalon.db.transport.Request;
   
   
   /**
  
  
  
  1.6       +6 -9      avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/CMDConnectionHandler.java
  
  Index: CMDConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/CMDConnectionHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CMDConnectionHandler.java	12 May 2002 11:36:36 -0000	1.5
  +++ CMDConnectionHandler.java	3 Mar 2003 16:40:32 -0000	1.6
  @@ -10,19 +10,16 @@
   
   
   
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
  -import org.apache.avalon.db.transport.Reply;
  -import org.apache.avalon.db.transport.Request;
  -import org.apache.avalon.db.transport.cmdstream.server.PlainCMDDatabaseManager;
  -import org.apache.avalon.db.services.DatabaseManager;
  -
  +import java.io.EOFException;
   import java.io.IOException;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  -import java.io.EOFException;
  -
   import java.net.Socket;
  +
  +import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
  +import org.apache.avalon.db.services.DatabaseManager;
  +import org.apache.avalon.db.transport.Request;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   
   
   /**
  
  
  

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


Mime
View raw message