Author: aconway
Date: Tue Jan 29 06:48:59 2008
New Revision: 616353
URL: http://svn.apache.org/viewvc?rev=616353&view=rev
Log:
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
Removed:
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HandlerUpdater.h
incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.h
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Jan 29 06:48:59 2008
@@ -111,7 +111,6 @@
qpid/framing/Array.cpp \
qpid/framing/BodyHolder.cpp \
qpid/framing/BodyHandler.cpp \
- qpid/framing/ChannelAdapter.cpp \
qpid/framing/Buffer.cpp \
qpid/framing/FieldTable.cpp \
qpid/framing/FieldValue.cpp \
@@ -358,7 +357,6 @@
qpid/framing/BodyHandler.h \
qpid/framing/Buffer.h \
qpid/framing/ChannelHandler.h \
- qpid/framing/ChannelAdapter.h \
qpid/framing/FieldTable.h \
qpid/framing/FieldValue.h \
qpid/framing/FrameDefaultVisitor.h \
@@ -367,7 +365,6 @@
qpid/framing/FrameSet.h \
qpid/framing/FramingContent.h \
qpid/framing/Handler.h \
- qpid/framing/HandlerUpdater.h \
qpid/framing/HeaderProperties.h \
qpid/framing/InitiationHandler.h \
qpid/framing/Invoker.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Jan 29
06:48:59 2008
@@ -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;
@@ -236,17 +234,6 @@
QPID_LOG(info, "Listening on port " << getPort());
}
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
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Tue Jan 29 06:48:59
2008
@@ -46,11 +46,6 @@
#include <vector>
namespace qpid {
-
-namespace framing {
-class HandlerUpdater;
-}
-
namespace broker {
/**
@@ -99,12 +94,6 @@
/** 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 @@
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;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h Tue Jan 29
06:48:59 2008
@@ -64,7 +64,8 @@
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;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp Tue Jan 29
06:48:59 2008
@@ -55,7 +55,7 @@
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));
}
}
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp Tue Jan
29 06:48:59 2008
@@ -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 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 @@
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());
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.h?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.h Tue Jan 29
06:48:59 2008
@@ -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 @@
/**
* 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);
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Jan 29 06:48:59 2008
@@ -123,7 +123,6 @@
.valgrind.supp \
.valgrindrc \
MessageUtils.h \
- MockChannel.h
\
MockConnectionInputHandler.h \
TxMocks.h \
qpid_test_plugin.h
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Tue Jan 29 06:48:59
2008
@@ -22,7 +22,6 @@
#include "qpid/framing/AMQP_HighestVersion.h"
#include "qpid/framing/AMQFrame.h"
#include "qpid/framing/FieldValue.h"
-#include "MockChannel.h"
#include "qpid_test_plugin.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Tue Jan 29 06:48:59
2008
@@ -25,7 +25,6 @@
#include "qpid/broker/QueueRegistry.h"
#include "qpid_test_plugin.h"
#include <iostream>
-#include "MockChannel.h"
#include "boost/format.hpp"
using namespace qpid;
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp Tue Jan 29 06:48:59
2008
@@ -25,7 +25,6 @@
#include <iostream>
#include <list>
#include <vector>
-#include "MockChannel.h"
using std::list;
using std::vector;
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp?rev=616353&r1=616352&r2=616353&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp Tue Jan 29
06:48:59 2008
@@ -25,7 +25,6 @@
#include <iostream>
#include <list>
#include <vector>
-#include "MockChannel.h"
#include "MessageUtils.h"
using std::list;
