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

diff --git a/cpp/src/tests/Cluster.cpp b/cpp/src/tests/Cluster.cpp
index ed50cc5d7b..008575140b 100644
--- a/cpp/src/tests/Cluster.cpp
+++ b/cpp/src/tests/Cluster.cpp
@@ -24,46 +24,44 @@
 #include "qpid/framing/BasicGetOkBody.h"
 
 
-
 static const ProtocolVersion VER;
 
 /** Verify membership ind a cluster with one member. */
 BOOST_AUTO_TEST_CASE(clusterOne) {
-    VectorFrameHandler received;
-    Cluster cluster("Test", "amqp:one:1", received, VER);
+    Cluster cluster("Test", "amqp:one:1");
+    TestClusterHandler handler(cluster);
     AMQFrame frame(VER, 1, new ChannelOkBody(VER));
-
     cluster.handle(frame);
-    BOOST_REQUIRE(received.waitFor(1));
+    BOOST_REQUIRE(handler.waitFrames(1));
     BOOST_CHECK_EQUAL(1u, cluster.size());
     Cluster::MemberList members = cluster.getMembers();
     BOOST_CHECK_EQUAL(1u, members.size());
     BOOST_REQUIRE_EQUAL(members.front()->url, "amqp:one:1");
-    BOOST_CHECK_EQUAL(1u, received.size());
-    BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody());
+    BOOST_CHECK_EQUAL(1u, handler.size());
+    BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *handler[0].getBody());
 }
 
 /** Fork a process to verify membership in a cluster with two members */
 BOOST_AUTO_TEST_CASE(clusterTwo) {
-    VectorFrameHandler received;
     pid_t pid=fork();
     BOOST_REQUIRE(pid >= 0);
-    if (pid) {                  // Parent
-        TestCluster cluster("Test", "amqp::1", received, VER);
-        BOOST_REQUIRE(cluster.waitFor(2));
+    if (pid) {                  // Parent see Cluster_child.cpp for child.
+        Cluster cluster("Test", "amqp::1");
+        TestClusterHandler handler(cluster);
+        BOOST_REQUIRE(handler.waitMembers(2));
 
         // Exchange frames with child.
         AMQFrame frame(VER, 1, new ChannelOkBody(VER));
         cluster.handle(frame);
-        BOOST_REQUIRE(received.waitFor(2));
-        BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody());
-        BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *received[1].getBody());
+        BOOST_REQUIRE(handler.waitFrames(2));
+        BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *handler[0].getBody());
+        BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *handler[1].getBody());
 
         // Wait for child to exit.
         int status;
         BOOST_CHECK_EQUAL(::wait(&status), pid);
         BOOST_CHECK_EQUAL(0, status);
-        BOOST_CHECK(cluster.waitFor(1));
+        BOOST_CHECK(handler.waitMembers(1));
         BOOST_CHECK_EQUAL(1u, cluster.size());
     }
     else {                      // Child