torquebox-messaging 2.3.2-java → 3.0.0.beta1-java

data/lib/torquebox/messaging/session.rb

@@ -23,6 +23,7 @@ module TorqueBox
       AUTO_ACK = javax.jms::Session::AUTO_ACKNOWLEDGE
       CLIENT_ACK = javax.jms::Session::CLIENT_ACKNOWLEDGE
       DUPS_OK_ACK = javax.jms::Session::DUPS_OK_ACKNOWLEDGE
+      SESSION_TRANSACTED = javax.jms::Session::SESSION_TRANSACTED
 
       attr_accessor :jms_session
       
@@ -149,14 +150,9 @@ module TorqueBox
       end
       
       def java_destination(destination)
-        java_destination = destination.name
-        
-        unless java_destination.is_a?( javax.jms.Destination )
-          meth = destination.is_a?( Queue ) ? :create_queue : :create_topic
-          java_destination = @jms_session.send( meth, java_destination )
-        end
-        
-        java_destination
+        return destination.java_destination unless destination.java_destination.nil?
+        meth = destination.is_a?( Queue ) ? :create_queue : :create_topic
+        @jms_session.send( meth, destination.name )
       end
       
       def self.canonical_ack_mode(ack_mode)

data/lib/torquebox/messaging/task.rb

@@ -23,11 +23,12 @@ require 'torquebox/messaging/processor_middleware/default_middleware'
 
 module TorqueBox
   module Messaging
-    
-    class Task 
+
+    # @api private
+    class Task
       include FutureStatus
       include ProcessorMiddleware::DefaultMiddleware
-      
+
       def self.queue_name( name = self.name[0...-4] )
         suffix = org.torquebox.core.util.StringUtils.underscore(name)
         "/queues/torquebox/#{ENV['TORQUEBOX_APP_NAME']}/tasks/#{suffix}"
@@ -40,11 +41,12 @@ module TorqueBox
           :method => method,
           :payload => payload,
           :future_id => future.correlation_id,
-          :future_queue => queue_name
+          :future_queue => queue_name,
+          :future_ttl => options[:future_ttl]
         }
         options[:encoding] = :marshal
         queue.publish( message, options )
-        
+
         future
       rescue javax.naming.NameNotFoundException => ex
         raise RuntimeError.new("The queue for #{self.name} is not available. Did you disable it by setting its concurrency to 0?")
@@ -52,7 +54,7 @@ module TorqueBox
 
       def process!(message)
         hash = message.decode
-        FutureResponder.new( Queue.new( hash[:future_queue] ), hash[:future_id] ).respond do
+        FutureResponder.new( Queue.new( hash[:future_queue] ), hash[:future_id], hash[:future_ttl] ).respond do
           self.send hash[:method].to_sym, hash[:payload]
         end
       end

data/lib/torquebox/messaging/topic.rb

@@ -23,21 +23,33 @@ module TorqueBox
     class Topic < Destination
 
       DEFAULT_SUBSCRIBER_NAME = 'subscriber-1'
-      
-      def self.start( name, options={} )
-        jndi = options.fetch( :jndi, [].to_java(:string) )
-        TorqueBox::ServiceRegistry.lookup("jboss.messaging.default.jms.manager") do |server|
-          server.createTopic( false, name, jndi )
-        end
-        new( name )
-      end
 
-      def stop
-        TorqueBox::ServiceRegistry.lookup("jboss.messaging.default.jms.manager") do |server|
-          server.destroyTopic( name )
+      class << self
+
+        # Creates the topic, starts and return a Topic object.
+        #
+        # @param name The name of the topic
+        # @param options Optional parameters (a Hash), including:
+        # @option options [Boolean] :exported If the topic should be visible in remote JNDI lookups
+        # @return [Topic] if the service is created and started
+        # @return [nil] if the service is not created in the specified time (30 s)
+        def start(name, options={})
+          exported = options.fetch(:exported, false)
+
+          with_destinationizer do |destinationizer|
+            latch = destinationizer.create_topic(name, exported)
+            return nil unless TorqueBox::Messaging::Destination.wait_for_latch(latch)
+          end
+
+          new(name, options)
         end
       end
 
+      # Unsubscribes the selected subscriber from the topic
+      #
+      # @param subscriber_name The subscriber name to unsubscribe
+      # @param options Optional parameters (a Hash)
+      # @return [void]
       def unsubscribe(subscriber_name = DEFAULT_SUBSCRIBER_NAME, options = { })
         wait_for_destination(options[:startup_timeout]) do
           with_session do |session|

data/lib/torquebox/messaging/xa_connection.rb

@@ -17,40 +17,37 @@
 
 module TorqueBox
   module Messaging
-    class XaConnection
+    class XaConnection < Connection
 
-      def initialize(jms_connection)
-        @jms_connection = jms_connection
-      end
-
-      def start
-        @jms_connection.start
+      def with_session(&block)
+        # Re-use a single XaSession per XaConnection
+        # This session gets closed by the afterCompletion
+        # callback on XaSession
+        @session ||= create_session
+        block.call( @session )
       end
 
-      def close
-        @jms_connection.close
+      def create_session(auto_enlist = true)
+        jms_session = jms_connection.create_xa_session
+        session = XaSession.new( jms_session, transaction, self )
+        if auto_enlist
+          transaction.enlist_resource( jms_session.xa_resource )
+          transaction.registerSynchronization( session )
+        end
+        session
       end
 
-      def client_id
-        @jms_connection.client_id
+      def session_transaction
+        @session.nil? ? nil : @session.transaction
       end
 
-      def client_id=(client_id)
-        @jms_connection.client_id = client_id
-      end
-      
-      def with_session(&block)
-        session = self.create_session()
-        begin
-          result = block.call( session )
-        ensure
-          session.close
-        end
-        return result
+      def close
+        super if @complete
       end
 
-      def create_session()
-        XaSession.new( @jms_connection.create_xa_session() )
+      def complete!
+        @complete = true
+        close
       end
 
     end

data/lib/torquebox/messaging/xa_connection_factory.rb

@@ -20,22 +20,11 @@ require 'torquebox/messaging/connection'
 
 module TorqueBox
   module Messaging
-    class XaConnectionFactory
-
-      attr_reader :internal_connection_factory
-      
-      def self.new(internal_connection_factory = nil)
-        return internal_connection_factory if internal_connection_factory.is_a?( XaConnectionFactory )
-        super
-      end
-
-      def initialize(internal_connection_factory = nil)
-        @internal_connection_factory = internal_connection_factory
-      end
+    class XaConnectionFactory < ConnectionFactory
 
       def with_new_connection(options, &block)
         client_id = options[:client_id]
-        connection = create_connection
+        connection = create_xa_connection( options )
         connection.client_id = client_id
         connection.start
         begin
@@ -46,10 +35,6 @@ module TorqueBox
         return result
       end
 
-      def create_connection()
-        XaConnection.new( @internal_connection_factory.create_xa_connection )
-      end
-
 
       def to_s
         "[XaConnectionFactory: internal_connection_factory=#{internal_connection_factory}]"

data/lib/torquebox/messaging/xa_session.rb

@@ -19,6 +19,27 @@ module TorqueBox
   module Messaging
 
     class XaSession < Session
+      include javax.transaction.Synchronization
+      attr_reader :transaction
+
+      def initialize( jms_session, transaction, connection )
+        super( jms_session )
+        @transaction = transaction
+        @connection = connection
+      end
+
+      def close
+        # eat the close, until tx completes
+      end
+
+      def beforeCompletion
+        # required interface
+      end
+
+      def afterCompletion(status)
+        @connection.deactivate
+        @connection.complete!
+      end
 
       def xa_resource
         @jms_session.xa_resource

data/lib/torquebox-messaging.rb

@@ -1,15 +1,19 @@
 module TorqueboxMessaging
-  VERSION = '2.3.2'
-  MAVEN_VERSION = '2.3.2'
+  VERSION = '3.0.0.beta1'
+  MAVEN_VERSION = '3.0.0.beta1'
 end
 begin
   require 'java'
   require File.dirname(__FILE__) + '/torquebox-messaging.jar'
   require File.dirname(__FILE__) + '/jboss-jms-api_1.1_spec-1.0.1.Final.jar'
   require File.dirname(__FILE__) + '/jboss-transaction-api_1.1_spec-1.0.1.Final.jar'
-  require File.dirname(__FILE__) + '/hornetq-core-2.2.21.Final.jar'
-  require File.dirname(__FILE__) + '/hornetq-jms-2.2.21.Final.jar'
-  require File.dirname(__FILE__) + '/netty-3.2.6.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-core-client-2.3.0.CR1.jar'
+  require File.dirname(__FILE__) + '/hornetq-commons-2.3.0.CR1.jar'
+  require File.dirname(__FILE__) + '/jboss-logging-3.1.2.GA.jar'
+  require File.dirname(__FILE__) + '/netty-3.6.2.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-journal-2.3.0.CR1.jar'
+  require File.dirname(__FILE__) + '/jboss-logmanager-1.4.0.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-jms-client-2.3.0.CR1.jar'
 rescue LoadError
   puts 'JAR-based gems require JRuby to load. Please visit www.jruby.org.'
   raise

data/licenses/cc0-1.0.txt

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

data/spec/backgroundable_spec.rb

@@ -176,6 +176,7 @@ describe TorqueBox::Messaging::Backgroundable do
                                              :future_id => '1234',
                                              :future_queue => "/queues/torquebox//tasks/torquebox_backgroundable",
                                              :method => '__sync_an_async_action',
+                                             :future_ttl => nil,
                                              :args => [:a, :b]
                                            },
                                            anything)
@@ -221,6 +222,16 @@ describe TorqueBox::Messaging::Backgroundable do
         @object.background.foo(1,2)
       end
 
+      it "should use default future ttl" do
+        @queue.should_receive(:publish).with(hash_including(:future_ttl => nil), anything)
+        @object.background.foo
+      end
+
+      it "should use custom future ttl" do
+        @queue.should_receive(:publish).with(hash_including(:future_ttl => 100_000), anything)
+        @object.background(:future_ttl => 100_000).foo
+      end
+
       it "should raise when given a block" do
         lambda {
           @object.background.foo { }
@@ -270,6 +281,16 @@ describe TorqueBox::Messaging::Backgroundable do
         @object.background.foo(1,2)
       end
 
+      it "should use default future ttl" do
+        @queue.should_receive(:publish).with(hash_including(:future_ttl => nil), anything)
+        @object.background.foo
+      end
+
+      it "should use custom future ttl" do
+        @queue.should_receive(:publish).with(hash_including(:future_ttl => 100_000), anything)
+        @object.background(:future_ttl => 100_000).foo
+      end
+
       it "should raise when given a block" do
         lambda {
           @object.background.foo { }

data/spec/destination_spec.rb

@@ -77,33 +77,98 @@ describe TorqueBox::Messaging::Destination do
     queue.with_session { }
   end
 
+  it "should return nil if the queue start times out" do
+    latch = mock("StartLatch")
+    latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS).and_raise("boom")
+
+    destinationizer = mock("Destinationizer")
+    destinationizer.should_receive(:create_queue).with("my_queue", true, "", false).and_return(latch)
+
+    TorqueBox::Messaging::Destination.should_receive(:with_destinationizer).and_yield(destinationizer)
+
+    queue = TorqueBox::Messaging::Queue.start("my_queue")
+    queue.should be_nil
+  end
+
+  it "should return nil if the topic start times out" do
+    latch = mock("StartLatch")
+    latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS).and_raise("boom")
+
+    destinationizer = mock("Destinationizer")
+    destinationizer.should_receive(:create_topic).with("my_topic", false).and_return(latch)
+
+    TorqueBox::Messaging::Destination.should_receive(:with_destinationizer).and_yield(destinationizer)
+
+    topic = TorqueBox::Messaging::Topic.start( "my_topic" )
+    topic.should be_nil
+  end
+
   it "should start and stop a queue" do
-    server = Mockito.mock(JMSServerManagerImpl.java_class)
-    TorqueBox::ServiceRegistry.stub!(:lookup).with("jboss.messaging.default.jms.manager").and_yield(server)
+    latch = mock("StartLatch")
+    latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS)
+
+    destinationizer = mock("Destinationizer")
+    destinationizer.should_receive(:create_queue).with("my_queue", true, "", false).and_return(latch)
+    destinationizer.should_receive(:remove_destination).with("my_queue")
 
-    queue = TorqueBox::Messaging::Queue.start( "my_queue" )
+    TorqueBox::Messaging::Destination.should_receive(:with_destinationizer).twice.and_yield(destinationizer)
+
+    queue = TorqueBox::Messaging::Queue.start("my_queue")
+    queue.should_not be_nil
     queue.name.should == "my_queue"
     queue.stop
-
-    Mockito.verify(server).createQueue(Matchers.anyBoolean,
-                                       Matchers.eq("my_queue"),
-                                       Matchers.anyString,
-                                       Matchers.anyBoolean)
-    Mockito.verify(server).destroyQueue("my_queue")
   end
 
   it "should start and stop a topic" do
-    server = Mockito.mock(JMSServerManagerImpl.java_class)
-    TorqueBox::ServiceRegistry.stub!(:lookup).with("jboss.messaging.default.jms.manager").and_yield(server)
+    latch = mock("StartLatch")
+    latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS)
+
+    destinationizer = mock("Destinationizer")
+    destinationizer.should_receive(:create_topic).with("my_topic", false).and_return(latch)
+    destinationizer.should_receive(:remove_destination).with("my_topic")
+
+    TorqueBox::Messaging::Destination.should_receive(:with_destinationizer).twice.and_yield(destinationizer)
 
     topic = TorqueBox::Messaging::Topic.start( "my_topic" )
     topic.name.should == "my_topic"
     topic.stop
+  end
+
+  it "should start a queue and stop it in an synchronous way" do
+    start_latch = mock("StartLatch")
+    start_latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS)
+
+    stop_latch = mock("StopLatch")
+    stop_latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS)
+
+    destinationizer = mock("Destinationizer")
+    destinationizer.should_receive(:create_queue).with("my_queue", true, "", false).and_return(start_latch)
+    destinationizer.should_receive(:remove_destination).with("my_queue").and_return(stop_latch)
+
+    TorqueBox::Messaging::Destination.should_receive(:with_destinationizer).twice.and_yield(destinationizer)
+
+    queue = TorqueBox::Messaging::Queue.start("my_queue")
+    queue.should_not be_nil
+    queue.name.should == "my_queue"
+    queue.stop_sync
+  end
+
+  it "should start a topic and stop it in an synchronous way" do
+    start_latch = mock("StartLatch")
+    start_latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS)
+
+    stop_latch = mock("StopLatch")
+    stop_latch.should_receive(:await).with(kind_of(Numeric), java.util.concurrent.TimeUnit::SECONDS)
 
-    Mockito.verify(server).createTopic(Matchers.anyBoolean,
-                                       Matchers.eq("my_topic"))
+    destinationizer = mock("Destinationizer")
+    destinationizer.should_receive(:create_topic).with("my_topic", false).and_return(start_latch)
+    destinationizer.should_receive(:remove_destination).with("my_topic").and_return(stop_latch)
 
-    Mockito.verify(server).destroyTopic("my_topic")
+    TorqueBox::Messaging::Destination.should_receive(:with_destinationizer).twice.and_yield(destinationizer)
+
+    topic = TorqueBox::Messaging::Topic.start( "my_topic" )
+    topic.name.should == "my_topic"
+    topic.stop_sync
   end
 
   it "should raise ArgumentError if destination is nil" do
@@ -187,6 +252,8 @@ describe TorqueBox::Messaging::Destination do
         jms_manager = mock('JMSManager')
         @server_control = mock('ServerControl')
 
+        TorqueBox::Registry.merge!("connection-factory" => Object.new)
+        TorqueBox::Registry.merge!("transaction-manager" => Object.new)
         TorqueBox::ServiceRegistry.stub!(:lookup).with("jboss.messaging.default.jms.manager").and_yield(jms_manager)
         Java::org.hornetq.jms.management.impl.JMSServerControlImpl.stub!(:new).with(jms_manager).and_return(@server_control)
       end