org.torquebox.torquebox-messaging-client 1.0.0.Beta22-java → 1.0.0.Beta23-java

data/lib/gem_hook.rb

@@ -2,3 +2,4 @@
 require 'torquebox/messaging/client'
 require 'torquebox/messaging/task'
 require 'torquebox/messaging/destination'
+require 'torquebox/messaging/message_processor'

data/lib/org.torquebox.torquebox-messaging-client.rb

@@ -1,15 +1,17 @@
 module TorqueboxMessagingClient
-  VERSION = '1.0.0.Beta22'
-  MAVEN_VERSION = '1.0.0.Beta22'
+  VERSION = '1.0.0.Beta23'
+  MAVEN_VERSION = '1.0.0.Beta23'
 end
 begin
   require 'java'
   require File.dirname(__FILE__) + '/torquebox-messaging-client.jar'
-  require File.dirname(__FILE__) + '/jboss-jms-api_1.1_spec-1.0.0.Beta1.jar'
+  require File.dirname(__FILE__) + '/jboss-jms-api_1.1_spec-1.0.0.Final.jar'
   require File.dirname(__FILE__) + '/hornetq-core-2.1.2.Final.jar'
   require File.dirname(__FILE__) + '/hornetq-jms-client-2.1.2.Final.jar'
   require File.dirname(__FILE__) + '/netty-3.2.1.Final.jar'
   require File.dirname(__FILE__) + '/hornetq-logging-2.1.2.Final.jar'
+  require File.dirname(__FILE__) + '/jnp-client-5.0.5.Final.jar'
+  require File.dirname(__FILE__) + '/jboss-common-core-2.2.17.GA.jar'
   require File.dirname(__FILE__) + '/jboss-logging-3.0.0.Beta4.jar'
   require File.dirname(__FILE__) + '/torquebox-interp-spi.jar'
   require File.dirname(__FILE__) + '/torquebox-interp-core.jar'

data/lib/torquebox/messaging/destination.rb

@@ -18,6 +18,15 @@ module TorqueBox
         end
       end
 
+      def receive options={}
+        result = nil
+        Client.connect(options) do |session|
+          result = session.receive( name, options )
+          session.commit if session.transacted?
+        end
+        result
+      end
+
       def start
         TorqueBox::Kernel.lookup("JMSServerManager") do |server|
           destination.name = name

data/lib/torquebox/messaging/ext/javax_jms_session.rb

@@ -5,8 +5,8 @@ module javax.jms::Session
   attr_accessor :connection
   attr_accessor :naming_context
 
-  def publish(destination_name, message)
-    destination = lookup_destination( destination_name )
+  def publish(destination, message)
+    destination = lookup_destination( destination ) unless destination.is_a?( Java::javax.jms.Destination )
     producer = createProducer( destination )
     jms_message = create_text_message
     jms_message.encode message
@@ -15,13 +15,52 @@ module javax.jms::Session
   end
 
   # Returns decoded message, by default.  Pass :decode=>false to
-  # return the original JMS TextMessage
+  # return the original JMS TextMessage.  Pass :timeout to give up
+  # after a number of milliseconds
   def receive(destination_name, options={})
     decode = options.fetch(:decode, true)
+    timeout = options.fetch(:timeout, 0)
     destination = lookup_destination( destination_name )
     consumer = createConsumer( destination )
-    jms_message = consumer.receive
-    decode ? jms_message.decode : jms_message
+    jms_message = consumer.receive( timeout )
+    if jms_message
+      decode ? jms_message.decode : jms_message
+    end
+  end
+
+  # Sends a message to specified destination, creates a temporary
+  # queue and waits for reply (request-reply pattern).
+  #
+  # Options:
+  #
+  # :timeout - specifies the time in miliseconds to wait for answer,
+  #            default: 10000 (10s)
+  # :decode  - pass false to return the original JMS TextMessage,
+  #            default: true
+  #
+  def send_and_receive(destination_name, message, options = {})
+    decode = options.fetch(:decode, true)
+    timeout = options.fetch(:timeout, 10000) # 10s
+    destination = lookup_destination( destination_name )
+
+    request_producer = createProducer( destination )
+
+    reply_queue = createTemporaryQueue
+    reply_receiver = createConsumer( reply_queue )
+
+    jms_message = createTextMessage
+    jms_message.jmsreply_to = reply_queue
+    jms_message.jmsdelivery_mode = Java::javax.jms.DeliveryMode.NON_PERSISTENT
+    jms_message.encode message
+
+    request_producer.send( jms_message )
+    commit
+    jms_message = reply_receiver.receive( timeout )
+    commit
+
+    if jms_message
+      decode ? jms_message.decode : jms_message
+    end
   end
 
   def lookup_destination(destination_name)

data/spec/client_spec.rb

@@ -29,7 +29,6 @@ describe TorqueBox::Messaging::Client do
       received_message = nil
 
       consumer_thread = Thread.new {
-        sleep( 2 )
         TorqueBox::Messaging::Client.connect() do |session|
           received_message = session.receive( '/queues/foo' )
           session.commit
@@ -105,13 +104,14 @@ describe TorqueBox::Messaging::Client do
       received_message.get_string_property( 'torquebox_encoding' ).should be_nil
     end
 
-    it "should be able to get a reference to JMSServerManager" do
-      @container["JMSServerManager"].should_not be_nil
-      require 'org/torquebox/interp/core/kernel'
-      TorqueBox::Kernel.kernel = @container.kernel
-      TorqueBox::Kernel.lookup("JMSServerManager").should_not be_nil
+    it "should timeout if asked" do
+      received_message = nil
+      TorqueBox::Messaging::Client.connect() do |session|
+        received_message = session.receive( '/queues/foo', :timeout => 1 )
+      end
+      received_message.should be_nil
     end
-  
+    
   end
 
 end

data/spec/destination_spec.rb

@@ -1,4 +1,7 @@
 
+require 'org.torquebox.torquebox-container-foundation'
+require 'org.torquebox.torquebox-naming-container'
+require 'org.torquebox.torquebox-messaging-container'
 require 'torquebox/messaging/destination'
 
 describe TorqueBox::Messaging::Destination do
@@ -31,4 +34,46 @@ describe TorqueBox::Messaging::Destination do
     topic.destroy
   end
 
+  describe "sending and receiving" do
+    before(:each) do
+      @container = TorqueBox::Container::Foundation.new
+      @container.enable( TorqueBox::Naming::NamingService ) {|config| config.export=false}
+      @container.enable( TorqueBox::Messaging::MessageBroker ) 
+      @container.start
+    end
+  
+    after(:each) do
+      @container.stop
+    end
+
+    it "should be able to publish to and receive from a queue" do
+      queue = TorqueBox::Messaging::Queue.new "/queues/foo"
+      queue.start
+
+      queue.publish "howdy"
+      message = queue.receive
+
+      queue.destroy
+      message.should eql( "howdy" )
+    end
+
+    it "should publish to multiple topic consumers" do
+      topic = TorqueBox::Messaging::Topic.new "/topics/foo"
+      topic.start
+      threads, count = [], 10
+
+      # Use a threadsafe "array"
+      msgs = java.util.Collections.synchronizedList( [] )
+
+      # Ensure all clients are blocking on the receipt of a message
+      count.times { threads << Thread.new { msgs << topic.receive } }
+      sleep(1)
+      topic.publish "howdy"
+      threads.each {|t| t.join}
+
+      topic.destroy
+      msgs.to_a.should eql( ["howdy"] * count )
+    end
+  end
+
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 1
     - 0
     - 0
-    - Beta22
-  version: 1.0.0.Beta22
+    - Beta23
+  version: 1.0.0.Beta23
 platform: java
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -05:00
+date: 2010-12-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
               - 1
               - 0
               - 0
-              - Beta22
-            version: 1.0.0.Beta22
+              - Beta23
+            version: 1.0.0.Beta23
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -44,8 +44,8 @@ dependencies:
               - 1
               - 0
               - 0
-              - Beta22
-            version: 1.0.0.Beta22
+              - Beta23
+            version: 1.0.0.Beta23
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -59,8 +59,8 @@ dependencies:
               - 1
               - 0
               - 0
-              - Beta22
-            version: 1.0.0.Beta22
+              - Beta23
+            version: 1.0.0.Beta23
     type: :development
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -89,11 +89,13 @@ files:
   - licenses/lgpl-2.1.txt
   - lib/torquebox-messaging-client.jar
   - lib/org.torquebox.torquebox-messaging-client.rb
-  - lib/jboss-jms-api_1.1_spec-1.0.0.Beta1.jar
+  - lib/jboss-jms-api_1.1_spec-1.0.0.Final.jar
   - lib/hornetq-core-2.1.2.Final.jar
   - lib/hornetq-jms-client-2.1.2.Final.jar
   - lib/netty-3.2.1.Final.jar
   - lib/hornetq-logging-2.1.2.Final.jar
+  - lib/jnp-client-5.0.5.Final.jar
+  - lib/jboss-common-core-2.2.17.GA.jar
   - lib/jboss-logging-3.0.0.Beta4.jar
   - lib/torquebox-interp-spi.jar
   - lib/torquebox-interp-core.jar