Author: aconway
Date: Thu May 13 18:55:06 2010
New Revision: 943975
URL: http://svn.apache.org/viewvc?rev=943975&view=rev
Log:
Moved FailoverUpdates to qpid::messaging namespace.
Added:
qpid/trunk/qpid/cpp/include/qpid/messaging/FailoverUpdates.h
- copied, changed from r943974,
qpid/trunk/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h
qpid/trunk/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
- copied, changed from r943974,
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
Removed:
qpid/trunk/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp
Copied: qpid/trunk/qpid/cpp/include/qpid/messaging/FailoverUpdates.h (from
r943974, qpid/trunk/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/FailoverUpdates.h?p2=qpid/trunk/qpid/cpp/include/qpid/messaging/FailoverUpdates.h&p1=qpid/trunk/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h&r1=943974&r2=943975&rev=943975&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h
(original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/FailoverUpdates.h Thu May 13
18:55:06 2010
@@ -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*/
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=943975&r1=943974&r2=943975&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu May 13 18:55:06 2010
@@ -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
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=943975&r1=943974&r2=943975&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Thu May 13 18:55:06 2010
@@ -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)
Copied: qpid/trunk/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp (from
r943974, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp&r1=943974&r2=943975&rev=943975&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp Thu May 13
18:55:06 2010
@@ -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 F
FailoverUpdates& FailoverUpdates::operator=(const FailoverUpdates&) { return
*this; }
-}}} // namespace qpid::client::amqp0_10
+}} // namespace qpid::messaging
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp?rev=943975&r1=943974&r2=943975&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp Thu May 13 18:55:06 2010
@@ -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 {
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp?rev=943975&r1=943974&r2=943975&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp Thu May 13 18:55:06 2010
@@ -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 {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
