Author: rhs
Date: Tue Jun 23 13:04:20 2009
New Revision: 787663
URL: http://svn.apache.org/viewvc?rev=787663&view=rev
Log:
renamed the type field of structs to st_type so it won't conflict with struct
fields
Modified:
qpid/trunk/qpid/ruby/examples/hello-world.rb
qpid/trunk/qpid/ruby/lib/qpid/codec.rb
qpid/trunk/qpid/ruby/lib/qpid/datatypes.rb
qpid/trunk/qpid/ruby/lib/qpid/delegates.rb
qpid/trunk/qpid/ruby/lib/qpid/session.rb
qpid/trunk/qpid/ruby/tests/connection.rb
Modified: qpid/trunk/qpid/ruby/examples/hello-world.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/examples/hello-world.rb?rev=787663&r1=787662&r2=787663&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/examples/hello-world.rb (original)
+++ qpid/trunk/qpid/ruby/examples/hello-world.rb Tue Jun 23 13:04:20 2009
@@ -36,7 +36,9 @@
# create a queue
ssn.queue_declare("test-queue")
-# publish a message
+ssn.exchange_declare("test-exchange", :type => "direct")
+
+# Publish a message
dp = ssn.delivery_properties(:routing_key => "test-queue")
mp = ssn.message_properties(:content_type => "text/plain")
msg = Qpid::Message.new(dp, mp, "Hello World!")
Modified: qpid/trunk/qpid/ruby/lib/qpid/codec.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/lib/qpid/codec.rb?rev=787663&r1=787662&r2=787663&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/lib/qpid/codec.rb (original)
+++ qpid/trunk/qpid/ruby/lib/qpid/codec.rb Tue Jun 23 13:04:20 2009
@@ -370,7 +370,7 @@
end
def write_struct32(value)
- type = value.type
+ type = value.st_type
sc = StringCodec.new(@spec)
sc.write_uint16(type.code)
type.encode_fields(sc, value)
@@ -383,7 +383,7 @@
end
def write_control(ctrl)
- type = ctrl.type
+ type = ctrl.st_type
write_uint16(type.code)
type.encode_fields(self, ctrl)
end
@@ -396,9 +396,9 @@
end
def write_command(hdr, cmd)
- type = cmd.type
+ type = cmd.st_type
write_uint16(type.code)
- hdr.type.encode(self, hdr)
+ hdr.st_type.encode(self, hdr)
type.encode_fields(self, cmd)
end
Modified: qpid/trunk/qpid/ruby/lib/qpid/datatypes.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/lib/qpid/datatypes.rb?rev=787663&r1=787662&r2=787663&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/lib/qpid/datatypes.rb (original)
+++ qpid/trunk/qpid/ruby/lib/qpid/datatypes.rb Tue Jun 23 13:04:20 2009
@@ -54,12 +54,12 @@
[type.name, unexpected]
end
- attrs[:type] = type
+ attrs[:st_type] = type
attrs[:id] = nil
name = "Qpid_" + type.name.to_s.capitalize
unless ::Struct.const_defined?(name)
- vars = type.fields.collect { |f| f.name } << :type << :id
+ vars = type.fields.collect { |f| f.name } << :st_type << :id
::Struct.new(name, *vars)
end
st = ::Struct.const_get(name)
@@ -90,13 +90,13 @@
def get(name)
if @headers
name = name.to_sym
- @headers.find { |h| h.type.name == name }
+ @headers.find { |h| h.st_type.name == name }
end
end
def set(header)
@headers ||= []
- if h = @headers.find { |h| h.type == header.type }
+ if h = @headers.find { |h| h.st_type == header.st_type }
ind = @headers.index(h)
@headers[ind] = header
else
@@ -107,7 +107,7 @@
def clear(name)
if @headers
name = name.to_sym
- @headers.delete_if { |h| h.type.name == name }
+ @headers.delete_if { |h| h.st_type.name == name }
end
end
Modified: qpid/trunk/qpid/ruby/lib/qpid/delegates.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/lib/qpid/delegates.rb?rev=787663&r1=787662&r2=787663&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/lib/qpid/delegates.rb (original)
+++ qpid/trunk/qpid/ruby/lib/qpid/delegates.rb Tue Jun 23 13:04:20 2009
@@ -44,7 +44,7 @@
if seg.track == @control
ctl = seg.decode(@spec)
log.debug("RECV %s", ctl) if log
- attr = ctl.type.name
+ attr = ctl.st_type.name
method(attr).call(ch, ctl)
elsif ssn.nil?
ch.session_detached
Modified: qpid/trunk/qpid/ruby/lib/qpid/session.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/lib/qpid/session.rb?rev=787663&r1=787662&r2=787663&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/lib/qpid/session.rb (original)
+++ qpid/trunk/qpid/ruby/lib/qpid/session.rb Tue Jun 23 13:04:20 2009
@@ -277,13 +277,13 @@
end
log.debug("RECV %s %s %s" % [cmd.id, hdr, cmd]) if log
- if cmd.type.payload
- result = @delegate.send(cmd.type.name, cmd, header, body)
+ if cmd.st_type.payload
+ result = @delegate.send(cmd.st_type.name, cmd, header, body)
else
- result = @delegate.send(cmd.type.name, cmd)
+ result = @delegate.send(cmd.st_type.name, cmd)
end
- unless cmd.type.result.nil?
+ unless cmd.st_type.result.nil?
execution_result(cmd.id, result)
end
Modified: qpid/trunk/qpid/ruby/tests/connection.rb
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/ruby/tests/connection.rb?rev=787663&r1=787662&r2=787663&view=diff
==============================================================================
--- qpid/trunk/qpid/ruby/tests/connection.rb (original)
+++ qpid/trunk/qpid/ruby/tests/connection.rb Tue Jun 23 13:04:20 2009
@@ -49,7 +49,7 @@
end
def queue_query(qq)
- return qq.type.result.create(qq.queue)
+ return qq.st_type.result.create(qq.queue)
end
def message_transfer(cmd, headers, body)
@@ -64,6 +64,10 @@
@queue.put([cmd, headers, body])
end
end
+
+ def exchange_declare(ed)
+ # do nothing
+ end
end
class TestConnectionTest < Test::Unit::TestCase
@@ -232,4 +236,11 @@
:message => Qpid::Message.new("test"))
s.sync(10)
end
+
+ def test_exchange_declare
+ c = connect
+ c.start(10)
+ s = c.session("test")
+ s.exchange_declare("test-exchange")
+ end
end
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
