* 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, 20 insertions, 20 deletions

diff --git a/cpp/tests/AcceptorTest.cpp b/cpp/tests/AcceptorTest.cpp
index 394dfea463..34a51888d4 100644
--- a/cpp/tests/AcceptorTest.cpp
+++ b/cpp/tests/AcceptorTest.cpp
@@ -28,7 +28,7 @@
 #include "framing/Buffer.h"
 #include "qpid_test_plugin.h"
 
-#include "MockSessionHandler.h"
+#include "MockConnectionInputHandler.h"
 
 using namespace qpid::sys;
 using namespace qpid::framing;
@@ -45,7 +45,7 @@ class AcceptorTest : public CppUnit::TestCase, private Runnable
     CPPUNIT_TEST_SUITE_END();
 
   private:
-    MockSessionHandlerFactory factory;
+    MockConnectionInputHandlerFactory factory;
     Acceptor::shared_ptr acceptor;
 
   public:
diff --git a/cpp/tests/EventChannelConnectionTest.cpp b/cpp/tests/EventChannelConnectionTest.cpp
index a6b309d771..5e94b07dbd 100644
--- a/cpp/tests/EventChannelConnectionTest.cpp
+++ b/cpp/tests/EventChannelConnectionTest.cpp
@@ -24,11 +24,11 @@
 #include "framing/AMQHeartbeatBody.h"
 #include "framing/AMQFrame.h"
 #include "sys/posix/EventChannelConnection.h"
-#include "sys/SessionHandler.h"
-#include "sys/SessionHandlerFactory.h"
+#include "sys/ConnectionInputHandler.h"
+#include "sys/ConnectionInputHandlerFactory.h"
 #include "sys/Socket.h"
 #include "qpid_test_plugin.h"
-#include "MockSessionHandler.h"
+#include "MockConnectionInputHandler.h"
 
 using namespace qpid::sys;
 using namespace qpid::framing;
@@ -100,7 +100,7 @@ class EventChannelConnectionTest : public CppUnit::TestCase
     EventChannelThreads::shared_ptr threads;
     int pipe[2];
     std::auto_ptr<EventChannelConnection> connection;
-    MockSessionHandlerFactory factory;
+    MockConnectionInputHandlerFactory factory;
 };
 
 // Make this test suite a plugin.
diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
index 4822309102..d08249e759 100644
--- a/cpp/tests/Makefile.am
+++ b/cpp/tests/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES =				\
 EXTRA_DIST =		\
   topictest		\
   qpid_test_plugin.h	\
-  MockSessionHandler.h
+  MockConnectionInputHandler.h
 
 
 client_exe_tests =	\
diff --git a/cpp/tests/MockSessionHandler.h b/cpp/tests/MockConnectionInputHandler.h
index aace780ac9..522df0900f 100644
--- a/cpp/tests/MockSessionHandler.h
+++ b/cpp/tests/MockConnectionInputHandler.h
@@ -1,5 +1,5 @@
-#ifndef _tests_MockSessionHandler_h
-#define _tests_MockSessionHandler_h
+#ifndef _tests_MockConnectionInputHandler_h
+#define _tests_MockConnectionInputHandler_h
 
 /*
  *
@@ -19,16 +19,16 @@
  *
  */
 
-#include "sys/SessionHandler.h"
-#include "sys/SessionHandlerFactory.h"
+#include "sys/ConnectionInputHandler.h"
+#include "sys/ConnectionInputHandlerFactory.h"
 #include "sys/Monitor.h"
 #include "framing/ProtocolInitiation.h"
 
-struct MockSessionHandler : public qpid::sys::SessionHandler {
+struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 
-    MockSessionHandler() : state(START) {}
+    MockConnectionInputHandler() : state(START) {}
 
-    ~MockSessionHandler() {}
+    ~MockConnectionInputHandler() {}
     
     void initiated(qpid::framing::ProtocolInitiation* pi) {
         qpid::sys::Monitor::ScopedLock l(monitor);
@@ -86,12 +86,12 @@ struct MockSessionHandler : public qpid::sys::SessionHandler {
 };
 
 
-struct MockSessionHandlerFactory : public qpid::sys::SessionHandlerFactory {
-    MockSessionHandlerFactory() : handler(0) {}
+struct MockConnectionInputHandlerFactory : public qpid::sys::ConnectionInputHandlerFactory {
+    MockConnectionInputHandlerFactory() : handler(0) {}
 
-    qpid::sys::SessionHandler* create(qpid::sys::SessionContext*) {
+    qpid::sys::ConnectionInputHandler* create(qpid::sys::SessionContext*) {
         qpid::sys::Monitor::ScopedLock lock(monitor);
-        handler = new MockSessionHandler();
+        handler = new MockConnectionInputHandler();
         monitor.notifyAll();
         return handler;
     }
@@ -104,10 +104,10 @@ struct MockSessionHandlerFactory : public qpid::sys::SessionHandlerFactory {
             CPPUNIT_ASSERT(monitor.wait(deadline));
     }
     
-    MockSessionHandler* handler;
+    MockConnectionInputHandler* handler;
     qpid::sys::Monitor monitor;
 };
 
 
 
-#endif  /*!_tests_MockSessionHandler_h*/
+#endif  /*!_tests_MockConnectionInputHandler_h*/