QPID-2920: Rebased on trunk, fix up minor conflicts.qpid-2920-1

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-1@1165889 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 9 insertions, 12 deletions

diff --git a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
index 211b7052e5..7e9a1219ae 100644
--- a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
+++ b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
@@ -85,7 +85,7 @@ void MessageHandler::routed(RoutingId routingId) {
 }
 
 void MessageHandler::acquire(const std::string& q, uint32_t position) {
-    // Note acquires from other members. My own acquires were exeuted in
+    // Note acquires from other members. My own acquires were executed in
     // the connection thread
     if (sender() != self()) {
         // FIXME aconway 2010-10-28: need to store acquired messages on QueueContext
diff --git a/qpid/cpp/src/qpid/cluster/exp/Multicaster.h b/qpid/cpp/src/qpid/cluster/exp/Multicaster.h
index 5d6885a02b..6953d2bfbd 100644
--- a/qpid/cpp/src/qpid/cluster/exp/Multicaster.h
+++ b/qpid/cpp/src/qpid/cluster/exp/Multicaster.h
@@ -25,6 +25,7 @@
 #include "BufferFactory.h"
 #include "qpid/sys/PollableQueue.h"
 #include <sys/uio.h>            // For struct iovec
+#include <vector>
 
 namespace qpid {
 
diff --git a/qpid/cpp/src/tests/BrokerClusterCalls.cpp b/qpid/cpp/src/tests/BrokerClusterCalls.cpp
index b2c07f7469..01c0639bf0 100644
--- a/qpid/cpp/src/tests/BrokerClusterCalls.cpp
+++ b/qpid/cpp/src/tests/BrokerClusterCalls.cpp
@@ -229,7 +229,7 @@ QPID_AUTO_TEST_CASE(testReleaseReject) {
     i = 0;
     f.s.reject(m);
     BOOST_CHECK_EQUAL(h.at(i++), "routing(a)"); // Routing to alt exchange
-    BOOST_CHECK_EQUAL(h.at(i++), "enqueue(amq.fanout_altq, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "enqueue(altq, a)");
     BOOST_CHECK_EQUAL(h.at(i++), "routed(a)");
     BOOST_CHECK_EQUAL(h.at(i++), "dequeue(q, 1, a)");
     BOOST_CHECK_EQUAL(h.size(), i);
@@ -300,8 +300,8 @@ QPID_AUTO_TEST_CASE(testFanout) {
     sender.send(Message("a"));
     f.s.sync();
     BOOST_CHECK_EQUAL(h.at(i++), "routing(a)");
-    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r"));
-    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r"));
+    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(r"));
+    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(r"));
     BOOST_CHECK(h.at(i-1) != h.at(i-2));
     BOOST_CHECK_EQUAL(h.at(i++), "routed(a)");
     BOOST_CHECK_EQUAL(h.size(), i);
@@ -312,10 +312,10 @@ QPID_AUTO_TEST_CASE(testFanout) {
     Message m2 = r2.fetch(Duration::SECOND);
     f.s.acknowledge(m2, true);
 
-    BOOST_CHECK_EQUAL(h.at(i++), "acquire(amq.fanout_r1, 1, a)");
-    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(amq.fanout_r1, 1, a)");
-    BOOST_CHECK_EQUAL(h.at(i++), "acquire(amq.fanout_r2, 1, a)");
-    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(amq.fanout_r2, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "acquire(r1, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(r1, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "acquire(r2, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(r2, 1, a)");
     BOOST_CHECK_EQUAL(h.size(), i);
 }
 
diff --git a/qpid/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml
index 5fa51f7552..1fed9e7de1 100644
--- a/qpid/cpp/xml/cluster.xml
+++ b/qpid/cpp/xml/cluster.xml
@@ -78,10 +78,6 @@
       <field name="left" type="vbin16"/> <!-- packed member-id array -->
     </control>
 
-    <control name="message-expired" code="0x12">
-      <field name="id" type="uint64"/>
-    </control>
-
     <domain name="error-type" type="uint8" label="Types of error">
       <enum>
 	<choice name="none" value="0"/>