4 files changed, 1 insertions, 170 deletions
diff --git a/cpp/examples/messaging/CMakeLists.txt b/cpp/examples/messaging/CMakeLists.txt
index e7885d0b50..31310d4ae2 100644
--- a/cpp/examples/messaging/CMakeLists.txt
+++ b/cpp/examples/messaging/CMakeLists.txt
@@ -17,11 +17,9 @@
 # under the License.
 #
 
-add_example(messaging queue_listener)
 add_example(messaging queue_receiver)
 add_example(messaging queue_sender)
 
-add_example(messaging topic_listener)
 add_example(messaging topic_receiver)
 add_example(messaging topic_sender)
 
diff --git a/cpp/examples/messaging/Makefile.am b/cpp/examples/messaging/Makefile.am
index a16b0b3bb1..70a7fd59a6 100644
--- a/cpp/examples/messaging/Makefile.am
+++ b/cpp/examples/messaging/Makefile.am
@@ -21,23 +21,17 @@ examplesdir=$(pkgdatadir)/examples/messaging
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
-noinst_PROGRAMS=queue_sender queue_listener queue_receiver topic_sender topic_listener topic_receiver client server map_sender map_receiver
+noinst_PROGRAMS=queue_sender queue_receiver topic_sender topic_receiver client server map_sender map_receiver
 
 queue_sender_SOURCES=queue_sender.cpp
 queue_sender_LDADD=$(CLIENT_LIB)
 
-queue_listener_SOURCES=queue_listener.cpp
-queue_listener_LDADD=$(CLIENT_LIB)
-
 queue_receiver_SOURCES=queue_receiver.cpp
 queue_receiver_LDADD=$(CLIENT_LIB)
 
 topic_sender_SOURCES=topic_sender.cpp
 topic_sender_LDADD=$(CLIENT_LIB)
 
-topic_listener_SOURCES=topic_listener.cpp
-topic_listener_LDADD=$(CLIENT_LIB)
-
 topic_receiver_SOURCES=topic_receiver.cpp
 topic_receiver_LDADD=$(CLIENT_LIB)
 
diff --git a/cpp/examples/messaging/queue_listener.cpp b/cpp/examples/messaging/queue_listener.cpp
deleted file mode 100644
index 92a0eed5ed..0000000000
--- a/cpp/examples/messaging/queue_listener.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * 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
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Session.h>
-#include <qpid/messaging/Message.h>
-#include <qpid/messaging/MessageListener.h>
-#include <qpid/messaging/Receiver.h>
-
-#include <cstdlib>
-#include <iostream>
-
-using namespace qpid::messaging;
-      
-class Listener : public MessageListener
-{
-  public:
-    Listener(const Receiver& receiver);
-    void received(Message& message);
-    bool isFinished();
-  private:
-    Receiver receiver;
-    bool finished;
-};
-
-Listener::Listener(const Receiver& r) : receiver(r), finished(false) {}
-
-bool Listener::isFinished() { return finished; }
-
-void Listener::received(Message& message) 
-{
-    std::cout << "Message: " << message.getContent() << std::endl;
-    if (message.getContent() == "That's all, folks!") {
-        std::cout << "Shutting down listener" << std::endl;
-        receiver.cancel();
-        finished = true;
-    }
-}
-
-int main(int argc, char** argv) {
-    const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-
-    try {
-        Connection connection = Connection::open(url);
-        Session session = connection.newSession();
-
-        Receiver receiver = session.createReceiver("message_queue");
-        Listener listener(receiver);
-        receiver.setListener(&listener);
-        receiver.setCapacity(1);
-        receiver.start();
-        while (session.dispatch()) {
-            session.acknowledge();
-            if (listener.isFinished()) break;
-        }
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-    }
-    return 1;   
-}
-
-
diff --git a/cpp/examples/messaging/topic_listener.cpp b/cpp/examples/messaging/topic_listener.cpp
deleted file mode 100644
index 4c97caef7c..0000000000
--- a/cpp/examples/messaging/topic_listener.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * 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
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <qpid/messaging/Connection.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>
-
-using namespace qpid::messaging;
-      
-class Listener : public MessageListener
-{
-  public:
-    Listener(const Receiver& receiver);
-    void received(Message& message);
-    bool isFinished();
-  private:
-    Receiver receiver;
-    bool finished;
-};
-
-Listener::Listener(const Receiver& r) : receiver(r), finished(false) {}
-
-bool Listener::isFinished() { return finished; }
-
-void Listener::received(Message& message) 
-{
-    std::cout << "Message: " << message.getContent() << std::endl;
-    if (message.getContent() == "That's all, folks!") {
-        std::cout << "Shutting down listener" << std::endl;
-        receiver.cancel();
-        finished = true;
-    }
-}
-
-int main(int argc, char** argv) {
-    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();
-
-        Receiver receiver = session.createReceiver("news_service {filter:[control, " + pattern + "]}");
-        Listener listener(receiver);        
-        receiver.setListener(&listener);
-        receiver.setCapacity(1);
-        receiver.start();
-        while (session.dispatch() && !listener.isFinished()) ;
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-    }
-    return 1;   
-}