Author: gsim
Date: Thu Nov 13 10:48:43 2008
New Revision: 713785
URL: http://svn.apache.org/viewvc?rev=713785&view=rev
Log:
Minor cleanup edits to examples (from [EMAIL PROTECTED])
Modified:
incubator/qpid/trunk/qpid/cpp/examples/direct/declare_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/direct_producer.cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_producer.cpp
incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp
incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp
incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp
Modified: incubator/qpid/trunk/qpid/cpp/examples/direct/declare_queues.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/direct/declare_queues.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/direct/declare_queues.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/direct/declare_queues.cpp Thu Nov 13
10:48:43 2008
@@ -47,15 +47,10 @@
#include <qpid/client/Connection.h>
#include <qpid/client/Session.h>
-#include <unistd.h>
-#include <cstdlib>
-#include <iostream>
using namespace qpid::client;
using namespace qpid::framing;
-using std::string;
-
int main(int argc, char** argv) {
const char* host = argc>1 ? argv[1] : "127.0.0.1";
Modified: incubator/qpid/trunk/qpid/cpp/examples/direct/direct_producer.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/direct/direct_producer.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/direct/direct_producer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/direct/direct_producer.cpp Thu Nov
13 10:48:43 2008
@@ -68,7 +68,6 @@
int count = argc>3 ? atoi(argv[3]) : 10;
Connection connection;
- Message message;
try {
connection.open(host, port);
Session session = connection.newSession();
@@ -80,6 +79,7 @@
// just once. (In most simple cases, there is no need to set
// other message properties.)
+ Message message;
message.getDeliveryProperties().setRoutingKey("routing_key");
// Now send some messages ...
Modified: incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp Thu Nov 13
10:48:43 2008
@@ -46,6 +46,7 @@
#include <qpid/client/Connection.h>
#include <qpid/client/Session.h>
#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
#include <qpid/client/SubscriptionManager.h>
#include <unistd.h>
@@ -79,8 +80,9 @@
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 msg;
+
try {
connection.open(host, port);
Session session = connection.newSession();
Modified: incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_producer.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_producer.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_producer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_producer.cpp Thu Nov
13 10:48:43 2008
@@ -65,7 +65,6 @@
int port = argc>2 ? atoi(argv[2]) : 5672;
Connection connection;
- Message message;
try {
connection.open(host, port);
Session session = connection.newSession();
Modified: incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp Thu Nov 13
10:48:43 2008
@@ -45,6 +45,7 @@
#include <qpid/client/Connection.h>
#include <qpid/client/Session.h>
#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
#include <qpid/client/SubscriptionManager.h>
#include <unistd.h>
@@ -80,7 +81,6 @@
int port = argc>2 ? atoi(argv[2]) : 5672;
Connection connection;
- Message msg;
try {
connection.open(host, port);
Session session = connection.newSession();
Modified: incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp Thu Nov
13 10:48:43 2008
@@ -52,7 +52,6 @@
#include <unistd.h>
#include <cstdlib>
#include <iostream>
-#include <set>
using namespace qpid::client;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp Thu Nov
13 10:48:43 2008
@@ -104,7 +104,6 @@
int port = argc>2 ? atoi(argv[2]) : 5672;
Connection connection;
- Message message;
try {
connection.open(host, port);
Session session = connection.newSession();
Modified: incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp Thu Nov
13 10:48:43 2008
@@ -55,12 +55,11 @@
*
*/
-
#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 <qpid/client/SubscriptionManager.h>
#include <unistd.h>
#include <cstdlib>
@@ -71,6 +70,9 @@
using namespace qpid::client;
using namespace qpid::framing;
+using std::stringstream;
+using std::string;
+
class Listener : public MessageListener{
private:
SubscriptionManager& subscriptions;
@@ -94,14 +96,11 @@
}
-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();
@@ -123,6 +122,7 @@
// Each client sends the name of their own response queue so
// the service knows where to route messages.
+ Message request;
request.getDeliveryProperties().setRoutingKey("request");
request.getMessageProperties().setReplyTo(ReplyTo("amq.direct",
response_queue.str()));
Modified: incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp Thu Nov
13 10:48:43 2008
@@ -57,17 +57,16 @@
#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 <qpid/client/SubscriptionManager.h>
#include <unistd.h>
#include <cstdlib>
#include <iostream>
-#include <algorithm>
#include <sstream>
#include <string>
@@ -123,7 +122,7 @@
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();
Modified: incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp?rev=713785&r1=713784&r2=713785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp Thu Nov 13
10:48:43 2008
@@ -79,8 +79,8 @@
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 msg;
try {
connection.open(host, port);
Session session = connection.newSession();