summaryrefslogtreecommitdiff
path: root/cpp/examples/messaging
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/examples/messaging')
-rw-r--r--cpp/examples/messaging/client.cpp2
-rw-r--r--cpp/examples/messaging/drain.cpp7
-rw-r--r--cpp/examples/messaging/map_receiver.cpp7
-rw-r--r--cpp/examples/messaging/map_sender.cpp7
-rw-r--r--cpp/examples/messaging/queue_receiver.cpp2
-rw-r--r--cpp/examples/messaging/queue_sender.cpp2
-rw-r--r--cpp/examples/messaging/server.cpp2
-rw-r--r--cpp/examples/messaging/spout.cpp11
-rw-r--r--cpp/examples/messaging/topic_receiver.cpp2
-rw-r--r--cpp/examples/messaging/topic_sender.cpp2
10 files changed, 21 insertions, 23 deletions
diff --git a/cpp/examples/messaging/client.cpp b/cpp/examples/messaging/client.cpp
index 3f7afb5e3e..570497ca0b 100644
--- a/cpp/examples/messaging/client.cpp
+++ b/cpp/examples/messaging/client.cpp
@@ -42,7 +42,7 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Sender sender = session.createSender("service_queue");
diff --git a/cpp/examples/messaging/drain.cpp b/cpp/examples/messaging/drain.cpp
index a2fa0f1138..1215ac75d2 100644
--- a/cpp/examples/messaging/drain.cpp
+++ b/cpp/examples/messaging/drain.cpp
@@ -20,7 +20,6 @@
*/
#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/MapView.h>
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Receiver.h>
#include <qpid/messaging/Session.h>
@@ -97,14 +96,16 @@ int main(int argc, char** argv)
Connection connection(options.connectionOptions);
try {
connection.open(options.url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Receiver receiver = session.createReceiver(options.address);
Duration timeout = options.getTimeout();
Message message;
while (receiver.fetch(message, timeout)) {
std::cout << "Message(properties=" << message.getProperties() << ", content='" ;
if (message.getContentType() == "amqp/map") {
- std::cout << MapView(message);
+ Variant::Map map;
+ decode(message, map);
+ std::cout << map;
} else {
std::cout << message.getContent();
}
diff --git a/cpp/examples/messaging/map_receiver.cpp b/cpp/examples/messaging/map_receiver.cpp
index cdbb931299..7840a99fda 100644
--- a/cpp/examples/messaging/map_receiver.cpp
+++ b/cpp/examples/messaging/map_receiver.cpp
@@ -20,7 +20,6 @@
*/
#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/MapView.h>
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Receiver.h>
#include <qpid/messaging/Session.h>
@@ -42,10 +41,10 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Receiver receiver = session.createReceiver("message_queue");
- Message message = receiver.fetch();
- MapView content(message);
+ Variant::Map content;
+ decode(receiver.fetch(), content);
std::cout << content << std::endl;
session.acknowledge();
receiver.close();
diff --git a/cpp/examples/messaging/map_sender.cpp b/cpp/examples/messaging/map_sender.cpp
index dec918e836..8c85510717 100644
--- a/cpp/examples/messaging/map_sender.cpp
+++ b/cpp/examples/messaging/map_sender.cpp
@@ -20,7 +20,6 @@
*/
#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/MapContent.h>
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Sender.h>
#include <qpid/messaging/Session.h>
@@ -41,11 +40,11 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Sender sender = session.createSender("message_queue");
Message message;
- MapContent content(message);
+ Variant::Map content;
content["id"] = 987654321;
content["name"] = "Widget";
content["price"] = 0.99;//bad use of floating point number, just an example!
@@ -55,7 +54,7 @@ int main(int argc, char** argv) {
colours.push_back(Variant("white"));
content["colours"] = colours;
content["uuid"] = Uuid(true);
- content.encode();
+ encode(content, message);
sender.send(message);
session.sync();
diff --git a/cpp/examples/messaging/queue_receiver.cpp b/cpp/examples/messaging/queue_receiver.cpp
index 95756a9a3d..d7bcec1bb2 100644
--- a/cpp/examples/messaging/queue_receiver.cpp
+++ b/cpp/examples/messaging/queue_receiver.cpp
@@ -34,7 +34,7 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Receiver receiver = session.createReceiver("message_queue");
while (true) {
Message message = receiver.fetch();
diff --git a/cpp/examples/messaging/queue_sender.cpp b/cpp/examples/messaging/queue_sender.cpp
index 439e1dffaf..0d86f024b3 100644
--- a/cpp/examples/messaging/queue_sender.cpp
+++ b/cpp/examples/messaging/queue_sender.cpp
@@ -37,7 +37,7 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Sender sender = session.createSender("message_queue");
// Now send some messages ...
diff --git a/cpp/examples/messaging/server.cpp b/cpp/examples/messaging/server.cpp
index 837e5b7103..64dcc941ed 100644
--- a/cpp/examples/messaging/server.cpp
+++ b/cpp/examples/messaging/server.cpp
@@ -43,7 +43,7 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Receiver receiver = session.createReceiver("service_queue; {create: always}");
while (true) {
diff --git a/cpp/examples/messaging/spout.cpp b/cpp/examples/messaging/spout.cpp
index 4b67945317..61b3f88711 100644
--- a/cpp/examples/messaging/spout.cpp
+++ b/cpp/examples/messaging/spout.cpp
@@ -21,7 +21,6 @@
#include <qpid/messaging/Address.h>
#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/MapContent.h>
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Sender.h>
#include <qpid/messaging/Session.h>
@@ -138,7 +137,7 @@ struct Options : public qpid::Options
}
}
- void setEntries(MapContent& content) const
+ void setEntries(Variant::Map& content) const
{
for (string_vector::const_iterator i = entries.begin(); i != entries.end(); ++i) {
std::string name;
@@ -160,18 +159,18 @@ int main(int argc, char** argv)
Connection connection(options.connectionOptions);
try {
connection.open(options.url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Sender sender = session.createSender(options.address);
Message message;
options.setProperties(message);
if (options.entries.size()) {
- MapContent content(message);
+ Variant::Map content;
options.setEntries(content);
- content.encode();
+ encode(content, message);
} else if (options.content.size()) {
message.setContent(options.content);
- message.setContentType("text/plain; charset=utf8");
+ message.setContentType("text/plain");
}
AbsTime end(now(), options.timeout);
for (uint count = 0; (count < options.count || options.count == 0) && end > now(); count++) {
diff --git a/cpp/examples/messaging/topic_receiver.cpp b/cpp/examples/messaging/topic_receiver.cpp
index 54a7e82dfc..df2484adfb 100644
--- a/cpp/examples/messaging/topic_receiver.cpp
+++ b/cpp/examples/messaging/topic_receiver.cpp
@@ -36,7 +36,7 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Receiver receiver = session.createReceiver("news_service; {filter:[control, " + pattern + "]}");
while (true) {
Message message = receiver.fetch();
diff --git a/cpp/examples/messaging/topic_sender.cpp b/cpp/examples/messaging/topic_sender.cpp
index a37d4b5371..6b1f85ec6f 100644
--- a/cpp/examples/messaging/topic_sender.cpp
+++ b/cpp/examples/messaging/topic_sender.cpp
@@ -54,7 +54,7 @@ int main(int argc, char** argv) {
Connection connection;
try {
connection.open(url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
Sender sender = session.createSender("news_service");
// Now send some messages to each topic...
View Lorry Controller Status