summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/bindings/qpid/ruby/Rakefile19
-rw-r--r--cpp/bindings/qpid/ruby/examples/client.rb2
-rw-r--r--cpp/bindings/qpid/ruby/examples/drain.rb2
-rw-r--r--cpp/bindings/qpid/ruby/examples/hello_world.rb2
-rw-r--r--cpp/bindings/qpid/ruby/examples/map_receiver.rb2
-rw-r--r--cpp/bindings/qpid/ruby/examples/map_sender.rb2
-rw-r--r--cpp/bindings/qpid/ruby/examples/server.rb2
-rw-r--r--cpp/bindings/qpid/ruby/examples/spout.rb2
-rw-r--r--cpp/bindings/qpid/ruby/features/support/env.rb2
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid.rb)18
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/address.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/connection.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/duration.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/encoding.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/errors.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/errors.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/message.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/receiver.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/sender.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/session.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/lib/qpid_messaging/version.rb (renamed from cpp/bindings/qpid/ruby/lib/qpid/version.rb)0
-rw-r--r--cpp/bindings/qpid/ruby/spec/spec_helper.rb3
21 files changed, 27 insertions, 29 deletions
diff --git a/cpp/bindings/qpid/ruby/Rakefile b/cpp/bindings/qpid/ruby/Rakefile
index a813f15b8a..b57855ca4c 100644
--- a/cpp/bindings/qpid/ruby/Rakefile
+++ b/cpp/bindings/qpid/ruby/Rakefile
@@ -29,24 +29,24 @@ require "rubygems/package_task"
require "rake/clean"
require "rake/extensiontask"
-require "rake/rdoctask"
+require "rdoc/task"
require "rake/testtask"
require "cucumber/rake/task"
-require "spec/rake/spectask"
+require "rspec/core/rake_task"
CLOBBER.include("pkg")
-load "./lib/qpid/version.rb"
+load "./lib/qpid_messaging/version.rb"
#-------------
# Gem Details.
#-------------
-NAME = "qpid"
+NAME = "qpid_messaging"
# VERSION = Qpid::VERSION
-AUTHOR = "Darryl L. Pierce"
-EMAIL = "dpierce@redhat.com"
+AUTHOR = "Apache Qpid Project"
+EMAIL = "dev@qpid.apache.org"
HOMEPAGE = "http://qpid.apache.org"
SUMMARY = "Qpid is an enterprise messaging framework."
@@ -63,12 +63,11 @@ task :test => :"test:all"
namespace :test do
desc "Run RSpec tests."
- Spec::Rake::SpecTask.new do |t|
+ RSpec::Core::RakeTask.new do |t|
t.ruby_opts = ['-rtest/unit']
- t.spec_files = FileList["spec/**/*_spec.rb"]
- t.rcov = true
+ t.rcov = false
t.rcov_opts = [
- '--exclude', 'lib\/qpid.rb,spec\/,lib\/ruby',
+ '--exclude', 'lib\/qpid_messaging.rb,spec\/,lib\/ruby',
]
end
diff --git a/cpp/bindings/qpid/ruby/examples/client.rb b/cpp/bindings/qpid/ruby/examples/client.rb
index 86ec1b7254..be7e70722e 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"
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 = {
diff --git a/cpp/bindings/qpid/ruby/features/support/env.rb b/cpp/bindings/qpid/ruby/features/support/env.rb
index 1d15f56fc9..cc0097ca8b 100644
--- a/cpp/bindings/qpid/ruby/features/support/env.rb
+++ b/cpp/bindings/qpid/ruby/features/support/env.rb
@@ -19,4 +19,4 @@
$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../lib")
-require 'qpid'
+require 'qpid_messaging'
diff --git a/cpp/bindings/qpid/ruby/lib/qpid.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
index 1f00c136c1..38943447fe 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
@@ -17,13 +17,13 @@
# under the License.
#
-require 'qpid/errors'
-require 'qpid/duration'
-require 'qpid/address'
-require 'qpid/encoding'
-require 'qpid/message'
-require 'qpid/sender'
-require 'qpid/receiver'
-require 'qpid/session'
-require 'qpid/connection'
+require 'qpid_messaging/errors'
+require 'qpid_messaging/duration'
+require 'qpid_messaging/address'
+require 'qpid_messaging/encoding'
+require 'qpid_messaging/message'
+require 'qpid_messaging/sender'
+require 'qpid_messaging/receiver'
+require 'qpid_messaging/session'
+require 'qpid_messaging/connection'
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/address.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
index 266d8668d6..266d8668d6 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/address.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/connection.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
index 12669bc947..12669bc947 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/connection.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/duration.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
index e1ddd79cb6..e1ddd79cb6 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/duration.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/encoding.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
index 2f20fab18e..2f20fab18e 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/encoding.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/errors.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/errors.rb
index c98eb1ac12..c98eb1ac12 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/errors.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/errors.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/message.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
index edef0ac2a0..edef0ac2a0 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/message.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/receiver.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
index 0ce16309ed..0ce16309ed 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/receiver.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/sender.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
index 97227622f5..97227622f5 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/sender.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/session.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
index feb8aa5bb4..feb8aa5bb4 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/session.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid/version.rb b/cpp/bindings/qpid/ruby/lib/qpid_messaging/version.rb
index 737f021006..737f021006 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid/version.rb
+++ b/cpp/bindings/qpid/ruby/lib/qpid_messaging/version.rb
diff --git a/cpp/bindings/qpid/ruby/spec/spec_helper.rb b/cpp/bindings/qpid/ruby/spec/spec_helper.rb
index 90084963f4..865e60e0e2 100644
--- a/cpp/bindings/qpid/ruby/spec/spec_helper.rb
+++ b/cpp/bindings/qpid/ruby/spec/spec_helper.rb
@@ -17,5 +17,4 @@
# under the License.
#
-require 'qpid'
-require 'cqpid'
+require 'qpid_messaging'