QPID-3551 - Refactors the Qpid::Messaging::Connection APIs.

Applied patch from Darryl Pierce.


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

7 files changed, 7 insertions, 7 deletions

diff --git a/cpp/bindings/qpid/ruby/examples/client.rb b/cpp/bindings/qpid/ruby/examples/client.rb
index f42f25cfc9..86ec1b7254 100644
--- a/cpp/bindings/qpid/ruby/examples/client.rb
+++ b/cpp/bindings/qpid/ruby/examples/client.rb
@@ -25,7 +25,7 @@ if __FILE__ == $0
   broker  = ARGV[1] || "amqp:tcp:localhost:5672"
   options = ARGV[2] || ""
 
-  connection = Qpid::Messaging::Connection.new broker, options
+  connection = Qpid::Messaging::Connection.new :url => broker, :options => options
   connection.open
   session = connection.create_session
   sender = session.create_sender "service_queue"
diff --git a/cpp/bindings/qpid/ruby/examples/drain.rb b/cpp/bindings/qpid/ruby/examples/drain.rb
index a6cf35e189..9e8f699e8b 100644
--- a/cpp/bindings/qpid/ruby/examples/drain.rb
+++ b/cpp/bindings/qpid/ruby/examples/drain.rb
@@ -73,7 +73,7 @@ opts.parse!(ARGV)
 
 options[:address] = ARGV[0] || ""
 
-connection = Qpid::Messaging::Connection.new options[:broker], options[:connection_options]
+connection = Qpid::Messaging::Connection.new :url => options[:broker], :options => options[:connection_options]
 connection.open
 
 def render_map map
diff --git a/cpp/bindings/qpid/ruby/examples/hello_world.rb b/cpp/bindings/qpid/ruby/examples/hello_world.rb
index 703febeba1..c014fb8bd5 100644
--- a/cpp/bindings/qpid/ruby/examples/hello_world.rb
+++ b/cpp/bindings/qpid/ruby/examples/hello_world.rb
@@ -30,7 +30,7 @@ if __FILE__ == $0
   address = ARGV[1] || "amq.topic"
   options = ARGV[2] || ""
 
-  connection = Qpid::Messaging::Connection.new broker
+  connection = Qpid::Messaging::Connection.new :url => broker, :options => options
   connection.open
   session    = connection.create_session
   receiver   = session.create_receiver address
diff --git a/cpp/bindings/qpid/ruby/examples/map_receiver.rb b/cpp/bindings/qpid/ruby/examples/map_receiver.rb
index 805943a0a4..e08bd295ba 100644
--- a/cpp/bindings/qpid/ruby/examples/map_receiver.rb
+++ b/cpp/bindings/qpid/ruby/examples/map_receiver.rb
@@ -25,7 +25,7 @@ broker  = ARGV[0] || "amqp:tcp:127.0.0.1:5672"
 address = ARGV[1] || "message_queue; {create: always}"
 options = ARGV[2] || ""
 
-connection = Qpid::Messaging::Connection.new broker, options
+connection = Qpid::Messaging::Connection.new :url => broker, :options => options
 connection.open
 
 def display_value value
diff --git a/cpp/bindings/qpid/ruby/examples/map_sender.rb b/cpp/bindings/qpid/ruby/examples/map_sender.rb
index fa0c6e4562..3fb7ca58e3 100644
--- a/cpp/bindings/qpid/ruby/examples/map_sender.rb
+++ b/cpp/bindings/qpid/ruby/examples/map_sender.rb
@@ -25,7 +25,7 @@ broker  = ARGV[0] || "amqp:tcp:127.0.0.1:5672"
 address = ARGV[1] || "message_queue; {create: always}"
 options = ARGV[2] || []
 
-connection = Qpid::Messaging::Connection.new broker, options
+connection = Qpid::Messaging::Connection.new :url => broker, :options => options
 connection.open
 
 begin
diff --git a/cpp/bindings/qpid/ruby/examples/server.rb b/cpp/bindings/qpid/ruby/examples/server.rb
index ead9d58472..0cc0e30216 100644
--- a/cpp/bindings/qpid/ruby/examples/server.rb
+++ b/cpp/bindings/qpid/ruby/examples/server.rb
@@ -25,7 +25,7 @@ if __FILE__ == $0
   broker  = ARGV[0] || "amqp:tcp:localhost:5672"
   options = ARGV[1] || ""
 
-  connection = Qpid::Messaging::Connection.new broker, options
+  connection = Qpid::Messaging::Connection.new :url => broker, :options =>options
   connection.open
   session = connection.create_session
   receiver = session.create_receiver "service_queue; {create:always}"
diff --git a/cpp/bindings/qpid/ruby/examples/spout.rb b/cpp/bindings/qpid/ruby/examples/spout.rb
index c012e31f9d..ecc47fb15a 100644
--- a/cpp/bindings/qpid/ruby/examples/spout.rb
+++ b/cpp/bindings/qpid/ruby/examples/spout.rb
@@ -100,7 +100,7 @@ end
 # now get the non-arg options
 options[:address] = ARGV[0] unless ARGV[0].nil?
 
-connection = Qpid::Messaging::Connection.new options[:broker], options[:connection_options]
+connection = Qpid::Messaging::Connection.new :url => options[:broker], :options => options[:connection_options]
 connection.open
 session = connection.create_session
 sender = session.create_sender options[:address]