Update from trunk r1375509 through r1450773asyncstore

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

1 files changed, 80 insertions, 52 deletions

diff --git a/cpp/bindings/qpid/examples/perl/spout.pl b/cpp/bindings/qpid/examples/perl/spout.pl
index 7365e732bf..d8ac860143 100644..100755
--- a/cpp/bindings/qpid/examples/perl/spout.pl
+++ b/cpp/bindings/qpid/examples/perl/spout.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -20,117 +20,145 @@
 use strict;
 use warnings;
 
-use cqpid_perl;
+use qpid;
 use Getopt::Long;
+use Pod::Usage;
 use Time::Local;
 
-my $url = "127.0.0.1";
+my $url     = "127.0.0.1";
 my $timeout = 0;
 my $count   = 1;
 my $id      = "";
 my $replyto = "";
 my @properties;
 my @entries;
-my $content = "";
+my $content           = "";
 my $connectionOptions = "";
-my $address = "amq.direct";
+my $address           = "amq.direct";
+my $help;
 
 my $result = GetOptions(
-    "broker|b=s"           => \ $url,
-    "timeout|t=i"          => \ $timeout,
-    "count|c=i"            => \ $count,
-    "id|i=s"               => \ $id,
-    "replyto=s"            => \ $replyto,
-    "property|p=s@"        => \ @properties,
-    "map|m=s@"             => \ @entries,
-    "content=s"            => \ $content,
-    "connection-options=s" => \ $connectionOptions,   
-);
-
-
-if (! $result) {
-    print "Usage: perl drain.pl [OPTIONS]\n";
+    "broker|b=s"           => \$url,
+    "timeout|t=i"          => \$timeout,
+    "count|c=i"            => \$count,
+    "id|i=s"               => \$id,
+    "replyto=s"            => \$replyto,
+    "property|p=s@"        => \@properties,
+    "map|m=s@"             => \@entries,
+    "content=s"            => \$content,
+    "connection-options=s" => \$connectionOptions,
+    "help|h"               => \$help
+) || pod2usage( -verbose => 0 );
+
+pod2usage( -verbose => 1 ) if $help;
+
+if ( $#ARGV ge 0 ) {
+    $address = $ARGV[0];
 }
 
-
-if ($#ARGV ge 0) {
-    $address = $ARGV[0]
-}
-
-
 sub setEntries {
     my ($content) = @_;
 
     foreach (@entries) {
-        my ($name, $value) = split("=", $_);
+        my ( $name, $value ) = split( "=", $_ );
         $content->{$name} = $value;
     }
 }
 
-
 sub setProperties {
     my ($message) = @_;
 
     foreach (@properties) {
-        my ($name, $value) = split("=", $_);
-        $message->getProperties()->{$name} = $value;
+        my ( $name, $value ) = split( "=", $_ );
+        $message->setProperty( $name, $value );
     }
 }
 
-my $connection = new cqpid_perl::Connection($url, $connectionOptions);
+# create a connection object
+my $connection = new qpid::messaging::Connection( $url, $connectionOptions );
 
 eval {
+    # open the connection, create a session and then a sender
     $connection->open();
-    my $session  = $connection->createSession();
-    my $sender = $session->createSender($address);
+    my $session = $connection->create_session();
+    my $sender  = $session->create_sender($address);
 
-    my $message = new cqpid_perl::Message();
+    # create a message to be sent
+    my $message = new qpid::messaging::Message();
     setProperties($message) if (@properties);
     if (@entries) {
         my $content = {};
         setEntries($content);
-        cqpid_perl::encode($content, $message);
+        $message->set_content($content);
     }
     elsif ($content) {
-        $message->setContent($content);
-        $message->setContentType("text/plain");
+        $message->set_content($content);
+        $message->set_content_type("text/plain");
     }
 
+    # if a reply-to address was supplied, then create a receiver from the
+    # session and wait for a response to be sent
     my $receiver;
     if ($replyto) {
-        my $responseQueue = new cqpid_perl::Address($replyto);
-        $receiver = $session->createReceiver($responseQueue);
-        $message->setReplyTo($responseQueue);
+        my $responseQueue = new qpid::messaging::Address($replyto);
+        $receiver = $session->create_receiver($responseQueue);
+        $message->set_reply_to($responseQueue);
     }
 
     my $start = localtime;
-    my @s = split(/[:\s]/, $start);
-    my $s = "$s[3]$s[4]$s[5]";
-    my $n = $s;
-
-    for (my $i = 0; 
-        ($i < $count || $count == 0) and
-        ($timeout == 0 || abs($n - $s) < $timeout); 
-        $i++) {
+    my @s     = split( /[:\s]/, $start );
+    my $s     = "$s[3]$s[4]$s[5]";
+    my $n     = $s;
+
+    for (
+        my $i = 0 ;
+        ( $i < $count || $count == 0 )
+          and ( $timeout == 0 || abs( $n - $s ) < $timeout ) ;
+        $i++
+      )
+    {
 
         $sender->send($message);
 
         if ($receiver) {
+            print "Waiting for a response.\n";
             my $response = $receiver->fetch();
-            print "$i -> " . $response->getContent() . "\n";
+            print "$i -> " . $response->get_content() . "\n";
         }
 
         my $now = localtime;
-        my @n = split(/[:\s]/, $now);
-        my $n = "$n[3]$n[4]$n[5]";
+        my @n   = split( /[:\s]/, $now );
+        my $n   = "$n[3]$n[4]$n[5]";
     }
     $session->sync();
     $connection->close();
 };
 
 if ($@) {
-  $connection->close();
-  die $@;
+    $connection->close();
+    die $@;
 }
 
+__END__
+
+=head1 NAME
+
+spout - Send messages to the specified address
+
+=head1 SYNOPSIS
+
+  Usage: spout [OPTIONS] ADDRESS
+
+  Options:
+  -h, --help                   show this message
+  -b VALUE, --broker VALUE     url of broker to connect to
+  -t VALUE, --timeout VALUE    exit after the specified time
+  -c VALUE, --count VALUE      stop after count messageshave been sent, zero disables
+  -i VALUE, --id VALUE         use the supplied id instead of generating one
+  --replyto VALUE              specify reply-to value
+  -P VALUE, --property VALUE   specify message property
+  -M VALUE, --map VALUE        specify entry for map content
+  --content VALUE              specify textual content
+  --connection-options VALUE   connection options string in the form {name1:value1, name2:value2}
 
+=cut