From 05864fd8afca8a5e38b020b437460989172304b0 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce@apache.org>
Date: Mon, 4 Feb 2013 15:25:20 +0000
Subject: NO-JIRA: Changed references to "URI" to be "address string".

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1442150 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/bindings/qpid/ruby/ChangeLog                             | 4 ++--
 qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature  | 2 +-
 qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature    | 2 +-
 .../bindings/qpid/ruby/features/step_definitions/address_steps.rb | 2 +-
 qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb         | 8 ++++----
 qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb         | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'qpid/cpp/bindings')

diff --git a/qpid/cpp/bindings/qpid/ruby/ChangeLog b/qpid/cpp/bindings/qpid/ruby/ChangeLog
index 5fe9690b85..ab10e43da4 100644
--- a/qpid/cpp/bindings/qpid/ruby/ChangeLog
+++ b/qpid/cpp/bindings/qpid/ruby/ChangeLog
@@ -1,3 +1,3 @@
 Verison 0.22:
-	* Changed Qpid::Messaging::Address to use a URI on creation.
-	* Changed Qpid::Messaging::Message to allow a URI for reply_to.
+	* Changed Qpid::Messaging::Address to use an address string on creation.
+	* Changed Qpid::Messaging::Message to allow an address string for reply_to.
diff --git a/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
index 9a2db1a08e..def686f881 100644
--- a/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
@@ -25,5 +25,5 @@ Feature: Creating a receiver
 
   Scenario: Using an Address object
     Given an open session
-    And an Address with the uri "create-receiver-test;{create:always}"
+    And an Address with the string "create-receiver-test;{create:always}"
     Then creating a receiver with an Address succeeds
diff --git a/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
index 868d019e5d..c12b10e054 100644
--- a/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
@@ -21,5 +21,5 @@ Feature: Creating a sender
 
   Scenario: Using an Address object
     Given an open session
-    And an Address with the uri "my-queue/my-subject;{create:always}"
+    And an Address with the string "my-queue/my-subject;{create:always}"
     Then creating a sender with an Address succeeds
diff --git a/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
index 19ac5f84d3..a7eca6f9ce 100644
--- a/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
@@ -17,6 +17,6 @@
 # under the License.
 #
 
-Given /^an Address with the uri "(.*?)"$/ do |address|
+Given /^an Address with the string "(.*?)"$/ do |address|
   @address = Qpid::Messaging::Address.new "#{address}"
 end
diff --git a/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
index 7a4b0b08b6..a59f68c71b 100644
--- a/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
@@ -70,18 +70,18 @@ module Qpid
     #
     class Address
 
-      # Creates a new +Address+ object from an address URI.
+      # Creates a new +Address+ object from an address string.
       #
       # ==== Options
       #
-      # * uri - the address URI
+      # * address - the address string
       #
       # ==== Examples
       #
       #   addr = Qpid::Messaging::Address.new "my-queue;{create:always}"
       #
-      def initialize(uri, address_impl = nil)
-        @address_impl = address_impl || Cqpid::Address.new(uri)
+      def initialize(address, address_impl = nil)
+        @address_impl = address_impl || Cqpid::Address.new(address)
       end
 
       def address_impl # :nodoc:
diff --git a/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
index aaf62ba93d..d58b10b1e5 100644
--- a/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
@@ -53,7 +53,7 @@ module Qpid
       #
       # ==== Options
       #
-      # * address - an instance of +Address+, or an address URI
+      # * address - an instance of +Address+, or an address string
       #
       # ==== Examples
       #
-- 
cgit v1.2.1