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

2 files changed, 0 insertions, 26 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 8edbb25cd5..06a0d33a85 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -35,7 +35,6 @@
 #include "qpid/log/Statement.h"
 #include "qpid/Url.h"
 #include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/HandlerUpdater.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/sys/Acceptor.h"
 #include "qpid/sys/ConnectionInputHandler.h"
@@ -49,7 +48,6 @@
 #include <memory>
 
 using qpid::sys::Acceptor;
-using qpid::framing::HandlerUpdater;
 using qpid::framing::FrameHandler;
 using qpid::framing::ChannelId;
 using qpid::management::ManagementAgent;
@@ -238,17 +236,6 @@ Acceptor& Broker::getAcceptor() const {
     return *acceptor;
 }
 
-void Broker::add(const shared_ptr<HandlerUpdater>& updater) {
-    QPID_LOG(debug, "Broker added HandlerUpdater");
-    handlerUpdaters.push_back(updater);
-}
-
-void Broker::update(ChannelId channel, FrameHandler::Chains& chains) {
-    for_each(handlerUpdaters.begin(), handlerUpdaters.end(),
-             boost::bind(&HandlerUpdater::update, _1,
-                         channel, boost::ref(chains)));
-}
-
 ManagementObject::shared_ptr Broker::GetManagementObject(void) const
 {
     return dynamic_pointer_cast<ManagementObject> (mgmtObject);
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 32a3ea55f7..1917da83cc 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -46,11 +46,6 @@
 #include <vector>
 
 namespace qpid { 
-
-namespace framing {
-class HandlerUpdater;
-}
-
 namespace broker {
 
 /**
@@ -99,12 +94,6 @@ class Broker : public sys::Runnable, public Plugin::Target, public management::M
     /** Shut down the broker */
     virtual void shutdown();
 
-    /** Register a handler updater. */
-    void add(const shared_ptr<framing::HandlerUpdater>&);
-    
-    /** Apply all handler updaters to a handler chain pair. */
-    void update(framing::ChannelId, framing::FrameHandler::Chains&); 
-
     void setStore (MessageStore*);
     MessageStore& getStore() { return *store; }
     QueueRegistry& getQueues() { return queues; }
@@ -125,13 +114,11 @@ class Broker : public sys::Runnable, public Plugin::Target, public management::M
     Options config;
     sys::Acceptor::shared_ptr acceptor;
     MessageStore* store;
-    typedef std::vector<shared_ptr<framing::HandlerUpdater> > HandlerUpdaters;
 
     QueueRegistry queues;
     ExchangeRegistry exchanges;
     ConnectionFactory factory;
     DtxManager dtxManager;
-    HandlerUpdaters handlerUpdaters;
     SessionManager sessionManager;
     management::ManagementAgent::shared_ptr managementAgent;
     management::Broker::shared_ptr mgmtObject;