Added support for address parsing, create/assert/delete policies

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@834869 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 9 insertions, 19 deletions

diff --git a/cpp/examples/messaging/client.cpp b/cpp/examples/messaging/client.cpp
index de6d7768df..aaac554675 100644
--- a/cpp/examples/messaging/client.cpp
+++ b/cpp/examples/messaging/client.cpp
@@ -46,7 +46,7 @@ int main(int argc, char** argv) {
         Sender sender = session.createSender("service_queue");
 
         //create temp queue & receiver...
-        Address responseQueue = session.createTempQueue();
+        Address responseQueue("#response-queue {create:always, type:queue, node-properties:{x-amqp0-10-auto-delete:true}}");
         Receiver receiver = session.createReceiver(responseQueue);
 
 	// Now send some messages ...
diff --git a/cpp/examples/messaging/topic_listener.cpp b/cpp/examples/messaging/topic_listener.cpp
index ba999c03a7..4c97caef7c 100644
--- a/cpp/examples/messaging/topic_listener.cpp
+++ b/cpp/examples/messaging/topic_listener.cpp
@@ -20,11 +20,11 @@
  */
 
 #include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Filter.h>
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/MessageListener.h>
 #include <qpid/messaging/Session.h>
 #include <qpid/messaging/Receiver.h>
+#include <qpid/messaging/Variant.h>
 
 #include <cstdlib>
 #include <iostream>
@@ -57,15 +57,14 @@ void Listener::received(Message& message)
 }
 
 int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    const char* pattern = argc>2 ? argv[2] : "#.#";
+    const std::string url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
+    const std::string pattern = argc>2 ? argv[2] : "#.#";
 
     try {
         Connection connection = Connection::open(url);
         Session session = connection.newSession();
 
-        Filter filter(Filter::WILDCARD, pattern, "control");
-        Receiver receiver = session.createReceiver("news_service", filter);
+        Receiver receiver = session.createReceiver("news_service {filter:[control, " + pattern + "]}");
         Listener listener(receiver);        
         receiver.setListener(&listener);
         receiver.setCapacity(1);
@@ -78,5 +77,3 @@ int main(int argc, char** argv) {
     }
     return 1;   
 }
-
-
diff --git a/cpp/examples/messaging/topic_receiver.cpp b/cpp/examples/messaging/topic_receiver.cpp
index 7352a91b30..6f6c1a5677 100644
--- a/cpp/examples/messaging/topic_receiver.cpp
+++ b/cpp/examples/messaging/topic_receiver.cpp
@@ -19,32 +19,25 @@
  *
  */
 
-#include <qpid/messaging/Address.h>
 #include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Filter.h>
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Receiver.h>
 #include <qpid/messaging/Session.h>
+#include <qpid/messaging/Variant.h>
 
 #include <cstdlib>
 #include <iostream>
 
-#include <sstream>
-
 using namespace qpid::messaging;
 
-using std::stringstream;
-using std::string;
-
 int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    const char* pattern = argc>2 ? argv[2] : "#.#";
+    const std::string url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
+    const std::string pattern = argc>2 ? argv[2] : "#.#";
 
     try {
         Connection connection = Connection::open(url);
         Session session = connection.newSession();
-        Filter filter(Filter::WILDCARD, pattern, "control");
-        Receiver receiver = session.createReceiver(Address("news_service", "topic"), filter);
+        Receiver receiver = session.createReceiver("news_service {filter:[control, " + pattern + "]}");
         while (true) {
             Message message = receiver.fetch();
             std::cout << "Message: " << message.getContent() << std::endl;