Deleted unused classes, adjusted files that still mention them.

D      src/qpid/framing/ChannelAdapter.cpp
D      src/qpid/framing/ChannelAdapter.h
D      src/qpid/framing/HandlerUpdater.h
D      src/tests/BrokerChannelTest.cpp
D      src/tests/MockChannel.h


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@616353 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 8 insertions, 9 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h
index 7e8cb2d435..1c53bcb9a7 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/cpp/src/qpid/cluster/Cluster.h
@@ -64,7 +64,8 @@ class Cluster : public framing::FrameHandler,
 
     virtual ~Cluster();
 
-    framing::HandlerUpdater& getHandlerUpdater() { return sessions; }
+    // FIXME aconway 2008-01-29: 
+    //framing::HandlerUpdater& getHandlerUpdater() { return sessions; }
     
     /** Get the current cluster membership. */
     MemberList getMembers() const;
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp
index 380bd7f632..35a07fbc2d 100644
--- a/cpp/src/qpid/cluster/ClusterPlugin.cpp
+++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp
@@ -55,7 +55,7 @@ struct ClusterPlugin : public Plugin {
         if (broker && !options.clusterName.empty()) {
             assert(!cluster); // A process can only belong to one cluster.
             cluster = boost::in_place(options.clusterName, broker->getUrl(), boost::ref(*broker));
-            broker->add(make_shared_ptr(&cluster->getHandlerUpdater(), nullDeleter));
+            // broker->add(make_shared_ptr(&cluster->getHandlerUpdater(), nullDeleter));
         }
     }
 };
diff --git a/cpp/src/qpid/cluster/SessionManager.cpp b/cpp/src/qpid/cluster/SessionManager.cpp
index 71f52507b8..68e0223a40 100644
--- a/cpp/src/qpid/cluster/SessionManager.cpp
+++ b/cpp/src/qpid/cluster/SessionManager.cpp
@@ -25,7 +25,6 @@
 #include "qpid/framing/AMQP_ServerOperations.h"
 #include "qpid/broker/BrokerAdapter.h"
 #include "qpid/broker/Connection.h"
-#include "qpid/framing/ChannelAdapter.h"
 
 #include <boost/utility/in_place_factory.hpp>
 
@@ -37,7 +36,7 @@ using namespace sys;
 using namespace broker;
 
 /** Handler to send frames direct to local broker (bypass correlation etc.) */
-struct SessionManager::BrokerHandler : public FrameHandler, private ChannelAdapter
+struct SessionManager::BrokerHandler : public FrameHandler
 {
     Connection connection;
     SessionHandler sessionAdapter;
@@ -56,7 +55,7 @@ struct SessionManager::BrokerHandler : public FrameHandler, private ChannelAdapt
         connection(0, broker),
         sessionAdapter(connection, 0),
         session(sessionAdapter, 1),
-        adapter(session, static_cast<ChannelAdapter&>(*this)) {}
+        adapter(session, 0) {}  // FIXME aconway 2008-01-29: 
 
     void handle(AMQFrame& frame) {
         AMQMethodBody* body=dynamic_cast<AMQMethodBody*>(frame.getBody());
diff --git a/cpp/src/qpid/cluster/SessionManager.h b/cpp/src/qpid/cluster/SessionManager.h
index 10fe5f82d1..c0e0cb5736 100644
--- a/cpp/src/qpid/cluster/SessionManager.h
+++ b/cpp/src/qpid/cluster/SessionManager.h
@@ -21,7 +21,7 @@
 
 #include "ClassifierHandler.h"
 
-#include "qpid/framing/HandlerUpdater.h"
+//FIXME aconway 2008-01-29: #include "qpid/framing/HandlerUpdater.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/Mutex.h"
 
@@ -45,10 +45,9 @@ namespace cluster {
 
 /**
  * Manage the clusters session map.
- * 
+ *                              // FIXME aconway 2008-01-29: HandlerUpdater
  */
-class SessionManager : public framing::HandlerUpdater, public framing::FrameHandler,
-                       private boost::noncopyable
+class SessionManager : public framing::FrameHandler, private boost::noncopyable
 {
   public:
     SessionManager(broker::Broker& broker, framing::FrameHandler& cluster);