* Summary:

	 - Improved plugin framework and HandlerUpdater interface.
	 - Cluster handlers for traffic to/from cluster.
	 - Cluster HandlerUpdater configures channel chains for cluster.
	 - Cluster PluginProvider registers cluster objects with broker.

	* src/qpid/framing/AMQFrame.h: Made data members public. Handlers
	need to be able to modify frame data, getters/setters are just a
	nuisance here.

	* src/tests/Cluster.cpp: Updated for cluster changes, using
	handlers instead of friendship to hook test into Cluster code.

	* src/qpid/framing/amqp_types.h: Added CHANNEL_MAX and
	CHANNEL_HIGH_BIT constants.

	* src/qpid/framing/HandlerUpdater.h: Renamed ChannelInitializer,
	broke dependency on broker channel types.

	* src/qpid/framing/Handler.h: Added constructors and nextHandler()

	* src/qpid/framing/AMQFrame.h (class AMQFrame): Inlined getChannel()

	* src/qpid/cluster/ClusterPluginProvider.cpp: Provider for cluster
	plugins.

	* src/qpid/cluster/Cluster.cpp: Use ChannelManager. Factor out
	plugin details to ClusterPluginProvider.

	* src/qpid/cluster/ChannelManager.h: Insert cluster handlers
	into channel chains, route frames between cluster and channels.
	
	* src/qpid/broker/BrokerAdapter.cpp (startOk): use CHANNEL_MAX
	constant.

	* src/qpid/broker/Broker.cpp:
	 - Refactored for new plugin framework.
	 - Added getUrl().

	* src/qpid/Url.h: Added constructor from Address.

	* src/qpid/Plugin.h: Generalized plugin framework, broke
	dependency on Broker interfaces. We may want to use plug-ins for
	clients also at some point.

	* src/tests/run_test: Fix bug when VALGRIND is not set.


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

1 files changed, 6 insertions, 8 deletions

diff --git a/cpp/src/tests/Cluster_child.cpp b/cpp/src/tests/Cluster_child.cpp
index 1540717f4a..a5ac3e9669 100644
--- a/cpp/src/tests/Cluster_child.cpp
+++ b/cpp/src/tests/Cluster_child.cpp
@@ -32,16 +32,14 @@ static const ProtocolVersion VER;
 
 /** Chlid part of Cluster::clusterTwo test */
 void clusterTwo() {
-    VectorFrameHandler received;
-    TestCluster cluster("Test", "amqp::2", received, VER);
-    BOOST_REQUIRE(cluster.waitFor(2));
-    
-    BOOST_REQUIRE(received.waitFor(1));
-    BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody());
+    Cluster cluster("Test", "amqp::2");
+    TestClusterHandler handler(cluster);
+    BOOST_REQUIRE(handler.waitFrames(1));
+    BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *handler[0].getBody());
     AMQFrame frame(VER, 1, new BasicGetOkBody(VER));
     cluster.handle(frame);
-    BOOST_REQUIRE(received.waitFor(2));
-    BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *received[1].getBody());
+    BOOST_REQUIRE(handler.waitFrames(2));
+    BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *handler[1].getBody());
 } 
 
 int test_main(int, char**) {