Patch from Manuel Teira: https://issues.apache.org/jira/secure/CommentAssignIssue!default.jspa?action=5&id=12398038

 - Use standard automake makefiles to build cpp/examples.
 - Rationalize examples directory structure.

Additions to patch:
 - Fix for VPATH builds.
 - Fix make distcheck (finally!)


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

9 files changed, 391 insertions, 0 deletions

diff --git a/cpp/examples/request-response/Makefile.am b/cpp/examples/request-response/Makefile.am
new file mode 100644
index 0000000000..d2cddf3cfb
--- /dev/null
+++ b/cpp/examples/request-response/Makefile.am
@@ -0,0 +1,30 @@
+examplesdir=$(pkgdatadir)/examples/request-response
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=client server
+
+client_SOURCES=client.cpp
+client_LDADD=$(CLIENT_LIB)
+
+server_SOURCES=server.cpp
+server_LDADD=$(CLIENT_LIB)
+
+examples_DATA=               \
+	server.cpp           \
+	client.cpp           \
+	$(MAKEDIST)
+
+EXTRA_DIST=                  \
+	$(examples_DATA)     \
+	verify               \
+	verify.in            \
+	verify_cpp_python    \
+	verify_cpp_python.in \
+	verify_python_cpp    \
+	verify_python_cpp.in
+
+
+
+
+
diff --git a/cpp/examples/request-response/client.cpp b/cpp/examples/request-response/client.cpp
new file mode 100644
index 0000000000..0ee0e78c92
--- /dev/null
+++ b/cpp/examples/request-response/client.cpp
@@ -0,0 +1,148 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+
+/**
+ *  client.cpp
+ *
+ *  This program is one of two programs that illustrate the
+ *  request/response pattern.
+ *  
+ *    client.cpp (this program)
+ *
+ *      Make requests of a service, print the response.
+ *
+ *    service.cpp
+ *
+ *      Accept requests, reverse the letters in each message, and
+ *      return it as a response.
+ *
+ */
+
+
+#include <qpid/client/Connection.h>
+#include <qpid/client/SubscriptionManager.h>
+#include <qpid/client/Session.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+
+#include <unistd.h>
+#include <cstdlib>
+#include <iostream>
+
+#include <sstream>
+
+using namespace qpid::client;
+using namespace qpid::framing;
+
+class Listener : public MessageListener{
+  private:
+    SubscriptionManager& subscriptions;
+    int counter;
+  public:
+    Listener(SubscriptionManager& subscriptions);
+    virtual void received(Message& message);
+};
+
+Listener::Listener(SubscriptionManager& subs) : subscriptions(subs), counter(0)
+{}
+
+void Listener::received(Message& message) {
+    std::cout << "Response: " << message.getData() << std::endl;
+
+    ++ counter;
+    if (counter > 3) {
+        std::cout << "Shutting down listener for " << message.getDestination() << std::endl;
+        subscriptions.cancel(message.getDestination());
+    }
+}
+
+
+using std::stringstream;
+using std::string;
+
+int main(int argc, char** argv) {
+    const char* host = argc>1 ? argv[1] : "127.0.0.1";
+    int port = argc>2 ? atoi(argv[2]) : 5672;
+    Connection connection;
+    Message request;
+    try {
+        connection.open(host, port);
+        Session session =  connection.newSession();
+
+        //--------- Main body of program --------------------------------------------
+
+	// Create a response queue so the server can send us responses
+	// to our requests. Use the client's session ID as the name
+	// of the response queue.
+
+	stringstream response_queue;
+	response_queue << "client" << session.getId().getName();
+
+        // Use the name of the response queue as the routing key
+
+	session.queueDeclare(arg::queue=response_queue.str());
+        session.exchangeBind(arg::exchange="amq.direct", arg::queue=response_queue.str(), arg::bindingKey=response_queue.str());
+
+	// Each client sends the name of their own response queue so
+	// the service knows where to route messages.
+
+	request.getDeliveryProperties().setRoutingKey("request");
+	request.getMessageProperties().setReplyTo(ReplyTo("amq.direct", response_queue.str()));
+
+	// Create a listener for the response queue and listen for response messages.
+        std::cout << "Activating response queue listener for: " << response_queue.str() << std::endl;
+        SubscriptionManager subscriptions(session);
+        Listener listener(subscriptions);
+        subscriptions.subscribe(listener, response_queue.str());
+
+	// Now send some requests ...
+
+	string s[] = {
+            "Twas brillig, and the slithy toves",
+            "Did gire and gymble in the wabe.",
+            "All mimsy were the borogroves,",
+            "And the mome raths outgrabe."
+        };
+
+
+	for (int i=0; i<4; i++) {
+            request.setData(s[i]);
+            // Asynchronous transfer sends messages as quickly as
+            // possible without waiting for confirmation.
+            async(session).messageTransfer(arg::content=request, arg::destination="amq.direct");
+            std::cout << "Request: " << s[i] << std::endl;
+	}
+
+        std::cout << "Waiting for all responses to arrive ..." << std::endl;
+	subscriptions.run();
+
+        //-----------------------------------------------------------------------------
+
+        connection.close();
+        return 0;
+    } catch(const std::exception& error) {
+        std::cout << error.what() << std::endl;
+    }
+    return 1;
+}
+
+
diff --git a/cpp/examples/request-response/server.cpp b/cpp/examples/request-response/server.cpp
new file mode 100644
index 0000000000..df189cfdd8
--- /dev/null
+++ b/cpp/examples/request-response/server.cpp
@@ -0,0 +1,145 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+
+/**
+ *  server.cpp
+ *
+ *  This program is one of two programs that illustrate the
+ *  request/response pattern.
+ *  
+ *    client.cpp 
+ *
+ *      Make requests of a service, print the response.
+ *
+ *    server.cpp (this program)
+ *
+ *      Accept requests, reverse the letters in each message, and
+ *      return it as a response.
+ *
+ */
+
+
+#include <qpid/client/Connection.h>
+#include <qpid/client/SubscriptionManager.h>
+#include <qpid/client/Session.h>
+#include <qpid/client/AsyncSession.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+
+
+#include <unistd.h>
+#include <cstdlib>
+#include <iostream>
+#include <algorithm>
+
+#include <sstream>
+#include <string>
+
+using namespace qpid::client;
+using namespace qpid::framing;
+using std::stringstream;
+using std::string;
+
+class Listener : public MessageListener{
+  private:
+    SubscriptionManager& subscriptions;
+    AsyncSession asyncSession;
+  public:
+    Listener(SubscriptionManager& subscriptions, Session& session);
+    virtual void received(Message& message);
+};
+
+Listener::Listener(SubscriptionManager& subs, Session& session)
+    : subscriptions(subs), asyncSession(session)
+{}
+
+void Listener::received(Message& request) {
+    Message response;
+
+    // Get routing key for response from the request's replyTo property
+    string routingKey;
+
+    if (request.getMessageProperties().hasReplyTo()) {
+        routingKey = request.getMessageProperties().getReplyTo().getRoutingKey();
+    } else {
+        std::cout << "Error: " << "No routing key for request (" << request.getData() << ")" << std::endl;
+        return;
+    } 
+
+    std::cout << "Request: " << request.getData() << "  (" <<routingKey << ")" << std::endl;
+
+    // Transform message content to upper case
+    std::string s = request.getData();
+    std::transform (s.begin(), s.end(), s.begin(), toupper);
+    response.setData(s);
+
+    // Send it back to the user
+    response.getDeliveryProperties().setRoutingKey(routingKey);
+
+    // Asynchronous transfer sends messages as quickly as
+    // possible without waiting for confirmation.
+    asyncSession.messageTransfer(arg::content=response, arg::destination="amq.direct");
+}
+
+
+int main(int argc, char** argv) {
+    const char* host = argc>1 ? argv[1] : "127.0.0.1";
+    int port = argc>2 ? atoi(argv[2]) : 5672;
+    Connection connection;
+    Message message;
+    try {
+        connection.open(host, port);
+        Session session =  connection.newSession();
+
+        //--------- Main body of program --------------------------------------------
+
+
+	// Create a request queue for clients to use when making
+	// requests.
+	string request_queue = "request";
+
+        // Use the name of the request queue as the routing key
+	session.queueDeclare(arg::queue=request_queue);
+        session.exchangeBind(arg::exchange="amq.direct", arg::queue=request_queue, arg::bindingKey=request_queue);
+
+        // Create a listener and subscribe it to the request_queue
+        std::cout << "Activating request queue listener for: " << request_queue << std::endl;
+        SubscriptionManager subscriptions(session);
+        Listener listener(subscriptions, session);
+        subscriptions.subscribe(listener, request_queue);
+        // Deliver messages until the subscription is cancelled
+        // by Listener::received()
+
+        std::cout << "Waiting for requests" << std::endl;
+        subscriptions.run();
+
+        //-----------------------------------------------------------------------------
+
+        connection.close();
+        return 0;
+    } catch(const std::exception& error) {
+        std::cout << error.what() << std::endl;
+    }
+    return 1;
+}
+
+
diff --git a/cpp/examples/request-response/verify b/cpp/examples/request-response/verify
new file mode 100644
index 0000000000..76007ff8d2
--- /dev/null
+++ b/cpp/examples/request-response/verify
@@ -0,0 +1,5 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+background "Waiting" ./server
+clients ./client
+kill %% 			# Must kill the server.
+outputs "./client.out | remove_uuid" "server.out | remove_uuid"
diff --git a/cpp/examples/request-response/verify.in b/cpp/examples/request-response/verify.in
new file mode 100644
index 0000000000..7925dc5671
--- /dev/null
+++ b/cpp/examples/request-response/verify.in
@@ -0,0 +1,19 @@
+==== client.out | remove_uuid
+Activating response queue listener for: client
+Request: Twas brillig, and the slithy toves
+Request: Did gire and gymble in the wabe.
+Request: All mimsy were the borogroves,
+Request: And the mome raths outgrabe.
+Waiting for all responses to arrive ...
+Response: TWAS BRILLIG, AND THE SLITHY TOVES
+Response: DID GIRE AND GYMBLE IN THE WABE.
+Response: ALL MIMSY WERE THE BOROGROVES,
+Response: AND THE MOME RATHS OUTGRABE.
+Shutting down listener for client
+==== server.out | remove_uuid
+Activating request queue listener for: request
+Waiting for requests
+Request: Twas brillig, and the slithy toves  (client)
+Request: Did gire and gymble in the wabe.  (client)
+Request: All mimsy were the borogroves,  (client)
+Request: And the mome raths outgrabe.  (client)
diff --git a/cpp/examples/request-response/verify_cpp_python b/cpp/examples/request-response/verify_cpp_python
new file mode 100644
index 0000000000..867af3a92b
--- /dev/null
+++ b/cpp/examples/request-response/verify_cpp_python
@@ -0,0 +1,6 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+background "Request server running" $PYTHON_EXAMPLES/request-response/server.py
+clients ./client
+sleep 1
+kill %% 			# Must kill the server.
+outputs "./client.out | remove_uuid" "$PYTHON_EXAMPLES/request-response/server.py.out | remove_uuid"
diff --git a/cpp/examples/request-response/verify_cpp_python.in b/cpp/examples/request-response/verify_cpp_python.in
new file mode 100644
index 0000000000..a032293d9b
--- /dev/null
+++ b/cpp/examples/request-response/verify_cpp_python.in
@@ -0,0 +1,15 @@
+==== client.out | remove_uuid
+Activating response queue listener for: client
+Request: Twas brillig, and the slithy toves
+Request: Did gire and gymble in the wabe.
+Request: All mimsy were the borogroves,
+Request: And the mome raths outgrabe.
+Waiting for all responses to arrive ...
+Response: TWAS BRILLIG, AND THE SLITHY TOVES
+Response: DID GIRE AND GYMBLE IN THE WABE.
+Response: ALL MIMSY WERE THE BOROGROVES,
+Response: AND THE MOME RATHS OUTGRABE.
+Shutting down listener for client
+==== server.py.out | remove_uuid
+Request server running - run your client now.
+(Times out after 100 seconds ...)
diff --git a/cpp/examples/request-response/verify_python_cpp b/cpp/examples/request-response/verify_python_cpp
new file mode 100644
index 0000000000..d6f0fa7152
--- /dev/null
+++ b/cpp/examples/request-response/verify_python_cpp
@@ -0,0 +1,5 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+background "Waiting" ./server
+clients $PYTHON_EXAMPLES/request-response/client.py
+kill %% 			# Must kill the server.
+outputs "$PYTHON_EXAMPLES/request-response/client.py.out | remove_uuid" "server.out | remove_uuid"
diff --git a/cpp/examples/request-response/verify_python_cpp.in b/cpp/examples/request-response/verify_python_cpp.in
new file mode 100644
index 0000000000..1500134619
--- /dev/null
+++ b/cpp/examples/request-response/verify_python_cpp.in
@@ -0,0 +1,18 @@
+==== client.py.out | remove_uuid
+Request: Twas brillig, and the slithy toves
+Request: Did gyre and gimble in the wabe.
+Request: All mimsy were the borogroves,
+Request: And the mome raths outgrabe.
+Messages on queue: reply_to:
+Response: TWAS BRILLIG, AND THE SLITHY TOVES
+Response: DID GYRE AND GIMBLE IN THE WABE.
+Response: ALL MIMSY WERE THE BOROGROVES,
+Response: AND THE MOME RATHS OUTGRABE.
+No more messages!
+==== server.out | remove_uuid
+Activating request queue listener for: request
+Waiting for requests
+Request: Twas brillig, and the slithy toves  (reply_to:)
+Request: Did gyre and gimble in the wabe.  (reply_to:)
+Request: All mimsy were the borogroves,  (reply_to:)
+Request: And the mome raths outgrabe.  (reply_to:)