6 files changed, 21 insertions, 31 deletions
diff --git a/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h b/cpp/include/qpid/messaging/FailoverUpdates.h
index 159745e67c..1d4cfaa10d 100644
--- a/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h
+++ b/cpp/include/qpid/messaging/FailoverUpdates.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,24 +24,18 @@
 #include "qpid/client/ClientImportExport.h"
 
 namespace qpid {
-
 namespace messaging {
 class Connection;
-}
-
-namespace client {
-namespace amqp0_10 {
+class FailoverUpdatesImpl;
 
-struct FailoverUpdatesImpl;
 /**
- * A utility to listen for updates on cluster membership - published
- * via the amq.failover exchange - and update the list of known urls
- * for a connection accordingly.
+ * A utility to listen for updates on cluster membership and update
+ * the list of known urls for a connection accordingly.
  */
 class FailoverUpdates
 {
   public:
-    QPID_CLIENT_EXTERN FailoverUpdates(qpid::messaging::Connection& connection);
+    QPID_CLIENT_EXTERN FailoverUpdates(Connection& connection);
     QPID_CLIENT_EXTERN ~FailoverUpdates();
   private:
     FailoverUpdatesImpl* impl;
@@ -50,6 +44,6 @@ class FailoverUpdates
     FailoverUpdates(const FailoverUpdates&);
     FailoverUpdates& operator=(const FailoverUpdates&);
 };
-}}} // namespace qpid::client::amqp0_10
+}} // namespace qpid::messaging
 
 #endif  /*!QPID_CLIENT_AMQP0_10_FAILOVERUPDATES_H*/
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index e40bfd3d7d..3cd54f1084 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -711,13 +711,14 @@ set (qpidclient_SOURCES
      qpid/messaging/SessionImpl.h
      qpid/messaging/Sender.cpp
      qpid/messaging/SenderImpl.h
+     qpid/messaging/FailoverUpdates.h
+     qpid/messaging/FailoverUpdates.cpp
      qpid/client/amqp0_10/AcceptTracker.h
      qpid/client/amqp0_10/AcceptTracker.cpp
      qpid/client/amqp0_10/AddressResolution.h
      qpid/client/amqp0_10/AddressResolution.cpp
      qpid/client/amqp0_10/ConnectionImpl.h
      qpid/client/amqp0_10/ConnectionImpl.cpp
-     qpid/client/amqp0_10/FailoverUpdates.cpp
      qpid/client/amqp0_10/IncomingMessages.h
      qpid/client/amqp0_10/IncomingMessages.cpp
      qpid/client/amqp0_10/MessageSink.h
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index eaf961d6e7..4a5e26db79 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -724,13 +724,13 @@ libqpidclient_la_SOURCES =			\
   qpid/messaging/SenderImpl.h			\
   qpid/messaging/ReceiverImpl.h			\
   qpid/messaging/SessionImpl.h			\
+  qpid/messaging/FailoverUpdates.cpp		\
   qpid/client/amqp0_10/AcceptTracker.h		\
   qpid/client/amqp0_10/AcceptTracker.cpp	\
   qpid/client/amqp0_10/AddressResolution.h	\
   qpid/client/amqp0_10/AddressResolution.cpp	\
   qpid/client/amqp0_10/ConnectionImpl.h	        \
   qpid/client/amqp0_10/ConnectionImpl.cpp	\
-  qpid/client/amqp0_10/FailoverUpdates.cpp	\
   qpid/client/amqp0_10/IncomingMessages.h	\
   qpid/client/amqp0_10/IncomingMessages.cpp	\
   qpid/client/amqp0_10/MessageSink.h		\
@@ -828,11 +828,11 @@ nobase_include_HEADERS +=			\
   ../include/qpid/messaging/Message.h 		\
   ../include/qpid/messaging/Receiver.h 	        \
   ../include/qpid/messaging/Sender.h 		\
-  ../include/qpid/messaging/Session.h 		\
+  ../include/qpid/messaging/Session.h		\
+  ../include/qpid/messaging/FailoverUpdates.h	\
   ../include/qpid/types/Exception.h	 	\
   ../include/qpid/types/Uuid.h	 		\
-  ../include/qpid/types/Variant.h 		\
-  ../include/qpid/client/amqp0_10/FailoverUpdates.h
+  ../include/qpid/types/Variant.h
 
 # Force build of qpidd during dist phase so help2man will work.
 dist-hook: $(BUILT_SOURCES)
diff --git a/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp b/cpp/src/qpid/messaging/FailoverUpdates.cpp
index 09a9aa06d3..27b94aaa7a 100644
--- a/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
+++ b/cpp/src/qpid/messaging/FailoverUpdates.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "qpid/client/amqp0_10/FailoverUpdates.h"
+#include "qpid/messaging/FailoverUpdates.h"
 #include "qpid/messaging/Connection.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/Receiver.h"
@@ -31,10 +31,7 @@
 #include <vector>
 
 namespace qpid {
-namespace client {
-namespace amqp0_10 {
-
-using namespace qpid::messaging;
+namespace messaging {
 
 struct FailoverUpdatesImpl : qpid::sys::Runnable
 {
@@ -83,4 +80,4 @@ FailoverUpdates::FailoverUpdates(const FailoverUpdates&) : impl(0) {}
 FailoverUpdates& FailoverUpdates::operator=(const FailoverUpdates&) { return *this; }
 
 
-}}} // namespace qpid::client::amqp0_10
+}} // namespace qpid::messaging
diff --git a/cpp/src/tests/qpid_receive.cpp b/cpp/src/tests/qpid_receive.cpp
index 53d1d7d1fe..15b8d763eb 100644
--- a/cpp/src/tests/qpid_receive.cpp
+++ b/cpp/src/tests/qpid_receive.cpp
@@ -25,10 +25,10 @@
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
 #include <qpid/messaging/Message.h>
+#include <qpid/messaging/FailoverUpdates.h>
 #include <qpid/Options.h>
 #include <qpid/log/Logger.h>
 #include <qpid/log/Options.h>
-#include <qpid/client/amqp0_10/FailoverUpdates.h>
 #include "TestOptions.h"
 #include "Statistics.h"
 
@@ -37,8 +37,6 @@
 
 using namespace qpid::messaging;
 using namespace qpid::types;
-using qpid::client::amqp0_10::FailoverUpdates;
-
 using namespace std;
 
 namespace qpid {
diff --git a/cpp/src/tests/qpid_send.cpp b/cpp/src/tests/qpid_send.cpp
index 57282f7399..7fef57a966 100644
--- a/cpp/src/tests/qpid_send.cpp
+++ b/cpp/src/tests/qpid_send.cpp
@@ -24,7 +24,7 @@
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
-#include <qpid/client/amqp0_10/FailoverUpdates.h>
+#include <qpid/messaging/FailoverUpdates.h>
 #include <qpid/sys/Time.h>
 #include <qpid/sys/Monitor.h>
 #include "TestOptions.h"
@@ -37,7 +37,7 @@
 using namespace std;
 using namespace qpid::messaging;
 using namespace qpid::types;
-using qpid::client::amqp0_10::FailoverUpdates;
+
 typedef std::vector<std::string> string_vector;
 
 namespace qpid {