Update from trunk r1375509 through r1450773asyncstore

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

7 files changed, 8 insertions, 10 deletions

diff --git a/cpp/bindings/qpid/ruby/examples/client.rb b/cpp/bindings/qpid/ruby/examples/client.rb
index 86ec1b7254..f400acfd13 100644
--- a/cpp/bindings/qpid/ruby/examples/client.rb
+++ b/cpp/bindings/qpid/ruby/examples/client.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 
 if __FILE__ == $0
   broker  = ARGV[1] || "amqp:tcp:localhost:5672"
@@ -29,9 +29,7 @@ if __FILE__ == $0
   connection.open
   session = connection.create_session
   sender = session.create_sender "service_queue"
-  response_queue = Qpid::Messaging::Address.new("#response-queue", "",
-                                                :create => :always,
-                                                :delete => :always)
+  response_queue = Qpid::Messaging::Address.new("#response-queue;{create:always}")
   receiver = session.create_receiver response_queue
 
   ["Twas brillig, and the slithy toves",
diff --git a/cpp/bindings/qpid/ruby/examples/drain.rb b/cpp/bindings/qpid/ruby/examples/drain.rb
index 9e8f699e8b..8e506ea5cd 100644
--- a/cpp/bindings/qpid/ruby/examples/drain.rb
+++ b/cpp/bindings/qpid/ruby/examples/drain.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 require 'optparse'
 
 options = {
diff --git a/cpp/bindings/qpid/ruby/examples/hello_world.rb b/cpp/bindings/qpid/ruby/examples/hello_world.rb
index c014fb8bd5..1f4954dde9 100644
--- a/cpp/bindings/qpid/ruby/examples/hello_world.rb
+++ b/cpp/bindings/qpid/ruby/examples/hello_world.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 
 # This is your classic Hello World application, written in
 # Ruby, that uses Qpid. It demonstrates how to send and
diff --git a/cpp/bindings/qpid/ruby/examples/map_receiver.rb b/cpp/bindings/qpid/ruby/examples/map_receiver.rb
index e08bd295ba..16704dd48e 100644
--- a/cpp/bindings/qpid/ruby/examples/map_receiver.rb
+++ b/cpp/bindings/qpid/ruby/examples/map_receiver.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 
 broker  = ARGV[0] || "amqp:tcp:127.0.0.1:5672"
 address = ARGV[1] || "message_queue; {create: always}"
diff --git a/cpp/bindings/qpid/ruby/examples/map_sender.rb b/cpp/bindings/qpid/ruby/examples/map_sender.rb
index 3fb7ca58e3..1908774c31 100644
--- a/cpp/bindings/qpid/ruby/examples/map_sender.rb
+++ b/cpp/bindings/qpid/ruby/examples/map_sender.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 
 broker  = ARGV[0] || "amqp:tcp:127.0.0.1:5672"
 address = ARGV[1] || "message_queue; {create: always}"
diff --git a/cpp/bindings/qpid/ruby/examples/server.rb b/cpp/bindings/qpid/ruby/examples/server.rb
index 0cc0e30216..a589bea799 100644
--- a/cpp/bindings/qpid/ruby/examples/server.rb
+++ b/cpp/bindings/qpid/ruby/examples/server.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 
 if __FILE__ == $0
   broker  = ARGV[0] || "amqp:tcp:localhost:5672"
diff --git a/cpp/bindings/qpid/ruby/examples/spout.rb b/cpp/bindings/qpid/ruby/examples/spout.rb
index ecc47fb15a..71c04d8709 100644
--- a/cpp/bindings/qpid/ruby/examples/spout.rb
+++ b/cpp/bindings/qpid/ruby/examples/spout.rb
@@ -19,7 +19,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'qpid'
+require 'qpid_messaging'
 require 'optparse'
 
 options = {