cvs commit: jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server AltrmiDatabaseManager.java

[hammant]

hammant     2003/01/05 15:25:28

  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
  Log:
  AltRMI renames
  
  Revision  Changes    Path
  1.9       +7 -7      
jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/client/AltrmiConnection.java
  
  Index: AltrmiConnection.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/client/AltrmiConnection.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AltrmiConnection.java     5 Jan 2003 23:12:18 -0000       1.8
  +++ AltrmiConnection.java     5 Jan 2003 23:25:27 -0000       1.9
  @@ -22,8 +22,8 @@
   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.ClientClassAltrmiFactory;
  -import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
  -import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
  +import org.apache.excalibur.altrmi.common.ConnectionException;
  +import org.apache.excalibur.altrmi.common.InvocationException;
   
   import java.sql.SQLException;
   
  @@ -54,7 +54,7 @@
               } else {
                   throw new SQLException("Unknown altrmi transport");
               }
  -        } catch (AltrmiConnectionException ace) {
  +        } catch (ConnectionException ace) {
               throw new SQLException("Unable to establish connection to 
server: " + ace.getMessage());
           }
       }
  @@ -65,7 +65,7 @@
           AltrmiFactory altrmiFactory = new ClientClassAltrmiFactory(false);
           try {
               
altrmiFactory.setHostContext(getAltrmiHostContext(url,host,port));
  -        } catch (AltrmiConnectionException e) {
  +        } catch (ConnectionException e) {
               throw new AvalonDBSQLException("Some AltRMI Connection Exception 
during initialization", e);
           }
   
  @@ -76,7 +76,7 @@
               mDBManager = (DatabaseManager) altrmiFactory.lookup("AvalonDB");
               EstablishConnectionReply rep = (EstablishConnectionReply) 
this.sendRequest(new EstablishConnectionRequest(url));
               mRequestContextID = rep.getRequestContextID();
  -        } catch (AltrmiConnectionException ace) {
  +        } catch (ConnectionException ace) {
               ace.printStackTrace();
               throw new AvalonDBSQLException(
                   "Some IO Exception during connection creation to AltRMI 
Service" + url
  @@ -106,7 +106,7 @@
   
           try {
               return mDBManager.processRequest(request);
  -        } catch (AltrmiInvocationException aie) {
  +        } catch (InvocationException aie) {
               throw new SQLException("Connection to server lost, even after 
retries. Detail : " + aie.getMessage());
           }
       }
  
  
  
  1.7       +4 -4      
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AltrmiDatabaseManager.java        19 May 2002 12:16:20 -0000      1.6
  +++ AltrmiDatabaseManager.java        5 Jan 2003 23:25:28 -0000       1.7
  @@ -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.AltrmiPublisher;
  +import org.apache.excalibur.altrmi.server.Publisher;
   
   /**
    *
  @@ -31,7 +31,7 @@
   {
   
       protected BlockContext mContext;
  -    protected AltrmiPublisher mAltrmiPublisher;
  +    protected Publisher mAltrmiPublisher;
   
       public void contextualize( final Context context )
       {
  @@ -40,7 +40,7 @@
   
       /**
        *
  -     * @phoenix:dependency 
name="org.apache.excalibur.altrmi.server.AltrmiPublisher"
  +     * @phoenix:dependency 
name="org.apache.excalibur.altrmi.server.Publisher"
        * @phoenix:dependency name="org.apache.avalon.db.services.ParserManager"
        * @phoenix:dependency name="org.apache.avalon.db.services.SQLOptimizer"
        *
  @@ -49,7 +49,7 @@
       {
   
           super.service( serviceManager );
  -        mAltrmiPublisher = (AltrmiPublisher)serviceManager.lookup( 
AltrmiPublisher.class.getName() );
  +        mAltrmiPublisher = (Publisher)serviceManager.lookup( 
Publisher.class.getName() );
       }
   
       public void initialize() throws Exception
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>