* Renamed Session* classes to Connection* to align with AMQP spec

 - broker::SessionHandlerImpl -> broker::Connection
 - broker::SessionHandlerImplFactory -> broker::ConnectionFactory
 - sys::SessionHandler -> ConnectionInputHandler
 - sys::SessionHandlerFactory -> ConnectionInputHandlerFactory


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@496848 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 13 insertions, 13 deletions

diff --git a/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp b/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
index 7cd6f60902..787d12d6d1 100644
--- a/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
+++ b/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
@@ -27,8 +27,8 @@
 #include <boost/scoped_ptr.hpp>
 
 #include <sys/SessionContext.h>
-#include <sys/SessionHandler.h>
-#include <sys/SessionHandlerFactory.h>
+#include <sys/ConnectionInputHandler.h>
+#include <sys/ConnectionInputHandlerFactory.h>
 #include <sys/Acceptor.h>
 #include <sys/Socket.h>
 #include <framing/Buffer.h>
@@ -53,7 +53,7 @@ class EventChannelAcceptor : public Acceptor {
         
     int getPort() const;
     
-    void run(SessionHandlerFactory& factory);
+    void run(ConnectionInputHandlerFactory& factory);
 
     void shutdown();
 
@@ -68,7 +68,7 @@ class EventChannelAcceptor : public Acceptor {
     bool isRunning;
     boost::ptr_vector<EventChannelConnection> connections;
     AcceptEvent acceptEvent;
-    SessionHandlerFactory* factory;
+    ConnectionInputHandlerFactory* factory;
     bool isShutdown;
     EventChannelThreads::shared_ptr threads;
 };
@@ -100,7 +100,7 @@ int EventChannelAcceptor::getPort() const {
     return port;                // Immutable no need for lock.
 }
     
-void EventChannelAcceptor::run(SessionHandlerFactory& f) {
+void EventChannelAcceptor::run(ConnectionInputHandlerFactory& f) {
     {
         Mutex::ScopedLock l(lock);
         if (!isRunning && !isShutdown) {
diff --git a/cpp/lib/common/sys/posix/EventChannelConnection.cpp b/cpp/lib/common/sys/posix/EventChannelConnection.cpp
index 196dde5af8..4449dc3035 100644
--- a/cpp/lib/common/sys/posix/EventChannelConnection.cpp
+++ b/cpp/lib/common/sys/posix/EventChannelConnection.cpp
@@ -22,7 +22,7 @@
 #include <boost/assert.hpp>
 
 #include "EventChannelConnection.h"
-#include "sys/SessionHandlerFactory.h"
+#include "sys/ConnectionInputHandlerFactory.h"
 #include "QpidError.h"
 
 using namespace std;
@@ -36,7 +36,7 @@ const size_t EventChannelConnection::bufferSize = 65536;
     
 EventChannelConnection::EventChannelConnection(
     EventChannelThreads::shared_ptr threads_, 
-    SessionHandlerFactory& factory_,
+    ConnectionInputHandlerFactory& factory_,
     int rfd,
     int wfd,
     bool isTrace_
diff --git a/cpp/lib/common/sys/posix/EventChannelConnection.h b/cpp/lib/common/sys/posix/EventChannelConnection.h
index bace045993..1504e92651 100644
--- a/cpp/lib/common/sys/posix/EventChannelConnection.h
+++ b/cpp/lib/common/sys/posix/EventChannelConnection.h
@@ -24,17 +24,17 @@
 #include "EventChannelThreads.h"
 #include "sys/Monitor.h"
 #include "sys/SessionContext.h"
-#include "sys/SessionHandler.h"
+#include "sys/ConnectionInputHandler.h"
 #include "sys/AtomicCount.h"
 #include "framing/AMQFrame.h"
 
 namespace qpid {
 namespace sys {
 
-class SessionHandlerFactory;
+class ConnectionInputHandlerFactory;
 
 /**
- * Implements SessionContext and delegates to a SessionHandler
+ * Implements SessionContext and delegates to a ConnectionInputHandler
  * for a connection via the EventChannel.
  *@param readDescriptor file descriptor for reading.
  *@param writeDescriptor file descriptor for writing,
@@ -44,7 +44,7 @@ class EventChannelConnection : public SessionContext {
   public:
     EventChannelConnection(
         EventChannelThreads::shared_ptr threads, 
-        SessionHandlerFactory& factory,
+        ConnectionInputHandlerFactory& factory,
         int readDescriptor, 
         int writeDescriptor = 0,
         bool isTrace = false
@@ -86,7 +86,7 @@ class EventChannelConnection : public SessionContext {
     AtomicCount busyThreads;
 
     EventChannelThreads::shared_ptr threads;
-    std::auto_ptr<SessionHandler> handler;
+    std::auto_ptr<ConnectionInputHandler> handler;
     qpid::framing::Buffer in, out;
     FrameQueue writeFrames;
     bool isTrace;
diff --git a/cpp/lib/common/sys/posix/PosixAcceptor.cpp b/cpp/lib/common/sys/posix/PosixAcceptor.cpp
index 842aa76f36..a80a6c61f7 100644
--- a/cpp/lib/common/sys/posix/PosixAcceptor.cpp
+++ b/cpp/lib/common/sys/posix/PosixAcceptor.cpp
@@ -32,7 +32,7 @@ void fail() { throw qpid::Exception("PosixAcceptor not implemented"); }
 class PosixAcceptor : public Acceptor {
   public:
     virtual int16_t getPort() const { fail(); return 0; }
-    virtual void run(qpid::sys::SessionHandlerFactory* ) { fail(); }
+    virtual void run(qpid::sys::ConnectionInputHandlerFactory* ) { fail(); }
     virtual void shutdown() { fail(); }
 };