torquebox-messaging 2.0.0.beta2-java → 2.0.0.beta3-java

data/lib/torquebox/messaging/connection_factory.rb

@@ -33,9 +33,10 @@ module TorqueBox
         @internal_connection_factory = internal_connection_factory
       end
 
-      def with_new_connection(client_id = nil, &block)
-        connection = create_connection
-        connection.client_id = client_id
+      def with_new_connection(options, &block)
+        client_id = options[:client_id]
+        connection = create_connection( options[:naming_host], options[:naming_port] )
+        connection.client_id = client_id if client_id
         connection.start
         begin
           result = block.call( connection )
@@ -45,11 +46,12 @@ module TorqueBox
         return result
       end
 
-      def create_connection()
+      def create_connection(host, port)
+        host ||= "localhost"
+        port ||= 5445
         if !@internal_connection_factory
-          # try to connect to HornetQ directly - this currently
-          # assumes localhost, and the default AS7 HQ Netty port of 5445
-          connect_opts = { org.hornetq.core.remoting.impl.netty.TransportConstants::PORT_PROP_NAME => 5445.to_java( java.lang.Integer ) }
+          # try to connect to HornetQ directly
+          connect_opts = { "host" => host, "port" => port }
           transport_config =
             org.hornetq.api.core.TransportConfiguration.new("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory", 
                                                             connect_opts)

data/lib/torquebox/messaging/destination.rb

@@ -32,10 +32,10 @@ module TorqueBox
       attr_accessor :connect_options
 
       PRIORITY_MAP = {
-          :low => 1,
-          :normal => 4,
-          :high => 7,
-          :critical => 9
+        :low => 1,
+        :normal => 4,
+        :high => 7,
+        :critical => 9
       }
 
       def _dump(depth)
@@ -44,13 +44,18 @@ module TorqueBox
       end
 
       def self._load(str)
-       self.new( str )
+        self.new( str )
       end
 
-      def initialize(destination, connection_factory = __inject__( 'connection-factory' ))
+      def initialize(destination, connection_factory_or_options = nil)
+        if connection_factory_or_options.nil? || connection_factory_or_options.is_a?( Hash )
+          @connection_factory = ConnectionFactory.new( __inject__( 'connection-factory' ) )
+          @connect_options = connection_factory_or_options || {}
+        else
+          @connection_factory  = ConnectionFactory.new( connection_factory_or_options )
+          @connect_options = {}
+        end
         @name                = destination
-        @connection_factory  = ConnectionFactory.new( connection_factory )
-        @connect_options     = {}
         @enumerable_options  = {}
       end
 
@@ -86,7 +91,7 @@ module TorqueBox
 
       def with_session(opts = {})
         transactional = opts.fetch(:tx, true)
-        connection_factory.with_new_connection( connect_options[:client_id] ) do |connection|
+        connection_factory.with_new_connection( connect_options ) do |connection|
           connection.with_session(transactional) do |session|
             yield session
           end
@@ -119,7 +124,7 @@ module TorqueBox
           if PRIORITY_MAP[options[:priority]]
             options[:priority] = PRIORITY_MAP[options[:priority]]
           elsif (0..9) === options[:priority].to_i
-          options[:priority] = options[:priority].to_i
+            options[:priority] = options[:priority].to_i
           else
             raise ArgumentError.new(":priority must in the range 0..9, or one of #{PRIORITY_MAP.keys.collect {|k| ":#{k}"}.join(',')}")
           end

data/lib/torquebox/messaging/xa_connection_factory.rb

@@ -33,7 +33,8 @@ module TorqueBox
         @internal_connection_factory = internal_connection_factory
       end
 
-      def with_new_connection(client_id = nil, &block)
+      def with_new_connection(options, &block)
+        client_id = options[:client_id]
         connection = create_connection
         connection.client_id = client_id
         connection.start

data/lib/torquebox-messaging.rb

@@ -1,10 +1,15 @@
 module TorqueboxMessaging
-  VERSION = '2.0.0.beta2'
-  MAVEN_VERSION = '2.0.0.beta2'
+  VERSION = '2.0.0.beta3'
+  MAVEN_VERSION = '2.0.0.beta3'
 end
 begin
   require 'java'
   require File.dirname(__FILE__) + '/torquebox-messaging.jar'
+  require File.dirname(__FILE__) + '/jboss-jms-api_1.1_spec-1.0.0.Final.jar'
+  require File.dirname(__FILE__) + '/jboss-transaction-api_1.1_spec-1.0.0.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-core-2.2.10.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-jms-2.2.10.Final.jar'
+  require File.dirname(__FILE__) + '/netty-3.2.6.Final.jar'
 rescue LoadError
   puts 'JAR-based gems require JRuby to load. Please visit www.jruby.org.'
   raise

data/spec/destination_spec.rb

@@ -17,6 +17,30 @@ describe TorqueBox::Messaging::Destination do
     topic.name.should == "/topics/bar"
   end
 
+  it "should fall back to internal connection factory" do
+    factory = Object.new
+    TorqueBox::Registry.merge!("connection-factory" => factory)
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo")
+    queue.connection_factory.internal_connection_factory.should == factory
+  end
+
+  it "should initialize with connection factory if given" do
+    factory = Object.new
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo", factory)
+    queue.connection_factory.internal_connection_factory.should == factory
+    queue.connect_options.should be_empty
+  end
+
+  it "should default to no connect options" do
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo")
+    queue.connect_options.should be_empty
+  end
+
+  it "should initialize with connect options if given" do
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo", :naming_host => "bart")
+    queue.connect_options[:naming_host].should == "bart"
+  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)

metadata

@@ -2,7 +2,7 @@
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta2
+            version: 2.0.0.beta3
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta2
+            version: 2.0.0.beta3
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -58,6 +58,11 @@ files:
   - licenses/lgpl-2.1.txt
   - lib/torquebox-messaging.jar
   - lib/torquebox-messaging.rb
+  - lib/jboss-jms-api_1.1_spec-1.0.0.Final.jar
+  - lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar
+  - lib/hornetq-core-2.2.10.Final.jar
+  - lib/hornetq-jms-2.2.10.Final.jar
+  - lib/netty-3.2.6.Final.jar
   - lib/gem_hook.rb
   - lib/org.torquebox.messaging-client.rb
   - lib/torquebox/messaging.rb