hammant 01/11/04 00:44:16
Modified: apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server
PlainCMDDatabaseManager.java
apps/db/src/java/org/apache/avalon/db/transport/soap/server
SoapDatabaseManager.java
Added: apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server
CMDConnectionHandler.java
Removed: apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server
DBConnectionHandler.java
Log:
Fix of incorrect package declaration bugs
Revision Changes Path
1.6 +1 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java
Index: PlainCMDDatabaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PlainCMDDatabaseManager.java 2001/11/03 15:02:07 1.5
+++ PlainCMDDatabaseManager.java 2001/11/04 08:44:16 1.6
@@ -29,7 +29,6 @@
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.hsql.blocks.DBConnectionHandler;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -145,7 +144,7 @@
System.out.println("");
- DBConnectionHandler dbConnectionHandler = new
DBConnectionHandler(this);
+ CMDConnectionHandler dbConnectionHandler = new
CMDConnectionHandler(this);
setupLogger(dbConnectionHandler);
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/CMDConnectionHandler.java
Index: CMDConnectionHandler.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.transport.cmdstream.server;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.component.Component;
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.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.Socket;
/**
* This handles an individual incoming request.
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
public class CMDConnectionHandler extends AbstractLoggable
implements Component, ConnectionHandler {
private PlainCMDDatabaseManager mDatabaseManager;
private ObjectOutputStream mObjectOutputStream;
private ObjectInputStream mObjectInputStream;
/**
* Constructor CMDConnectionHandler
*
*
* @param databaseManager
*
*/
public CMDConnectionHandler(final DatabaseManager databaseManager) {
mDatabaseManager = (PlainCMDDatabaseManager) databaseManager;
}
/**
* Handle a connection.
* This handler is responsible for processing connections as they occur.
*
* @param socket the connection
* @exception IOException if an error reading from socket occurs
*/
public void handleConnection(final Socket socket) throws IOException {
final String remoteHost = socket.getInetAddress().getHostName();
final String remoteIP = socket.getInetAddress().getHostAddress();
mObjectOutputStream = new
ObjectOutputStream(socket.getOutputStream());
mObjectInputStream = new ObjectInputStream(socket.getInputStream());
getLogger().debug("AvalonDBConnection from " + remoteHost + " (" +
remoteIP + ")");
while (true) {
Request request = null;
try {
request = (Request) mObjectInputStream.readObject();
} catch (ClassNotFoundException cnfe) {} // won't happen.
mObjectOutputStream.writeObject(mDatabaseManager.processRequest(request));
}
}
}
1.2 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java
Index: SoapDatabaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapDatabaseManager.java 2001/11/02 11:09:08 1.1
+++ SoapDatabaseManager.java 2001/11/04 08:44:16 1.2
@@ -30,7 +30,7 @@
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 org.apache.avalon.hsql.blocks.DBConnectionHandler;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
