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

data/lib/gem_hook.rb

@@ -28,6 +28,7 @@ require 'torquebox/messaging/session'
 
 require 'torquebox/messaging/message'
 require 'torquebox/messaging/json_message'
+require 'torquebox/messaging/clojure_message'
 require 'torquebox/messaging/text_message'
 require 'torquebox/messaging/marshal_base64_message'
 require 'torquebox/messaging/marshal_message'
@@ -44,3 +45,5 @@ require 'torquebox/messaging/message_processor'
 require 'torquebox/messaging/task'
 require 'torquebox/messaging/backgroundable'
 require 'torquebox/messaging/processor_wrapper'
+
+require 'torquebox/messaging/datamapper_marshaling.rb'

data/lib/torquebox/messaging/backgroundable.rb

@@ -66,13 +66,12 @@ module TorqueBox
         end
 
         def method_added(method)
+          super
           method = method.to_s
           if @__backgroundable_methods &&
               @__backgroundable_methods[method] &&
               !@__backgroundable_methods[method][:backgrounding]
             __enable_backgrounding(method)
-          else
-            super
           end
         end
 

data/lib/torquebox/messaging/clojure_message.rb

@@ -0,0 +1,37 @@
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'clj'
+
+module TorqueBox
+  module Messaging
+    class ClojureMessage < Message
+      ENCODING = :clojure
+      JMS_TYPE = :text
+
+      def encode(message)
+        @jms_message.text = Clojure.dump(message)
+      end
+
+      def decode
+        Clojure.parse(@jms_message.text) unless @jms_message.text.nil?
+      end
+    end
+
+    Message.register_encoding( ClojureMessage )
+  end
+end

data/lib/torquebox/messaging/connection_factory.rb

@@ -35,7 +35,7 @@ module TorqueBox
 
       def with_new_connection(options, &block)
         client_id = options[:client_id]
-        connection = create_connection( options[:naming_host], options[:naming_port] )
+        connection = create_connection( options )
         connection.client_id = client_id if client_id
         connection.start
         begin
@@ -46,20 +46,24 @@ module TorqueBox
         return result
       end
 
-      def create_connection(host, port)
-        host ||= "localhost"
-        port ||= 5445
+      def create_connection(options)
+        host     = options[:host] || "localhost"
+        port     = options[:port] || 5445
+        username = options[:username]
+        password = options[:password]
         if !@internal_connection_factory
-          # 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)
-          @internal_connection_factory =
-            org.hornetq.api.jms.HornetQJMSClient.createConnectionFactoryWithoutHA( org.hornetq.api.jms::JMSFactoryType::CF, transport_config )
+          @internal_connection_factory = create_connection_factory( host, port )
         end
 
-        Connection.new( @internal_connection_factory.create_connection )
+        Connection.new( @internal_connection_factory.create_connection( username, password ) )
+      end
+
+      def create_connection_factory(host, port)
+        connect_opts = { "host" => host, "port" => port }
+        transport_config =
+          org.hornetq.api.core.TransportConfiguration.new("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory",
+                                                          connect_opts)
+        org.hornetq.api.jms.HornetQJMSClient.createConnectionFactoryWithoutHA( org.hornetq.api.jms::JMSFactoryType::CF, transport_config )
       end
 
 

data/lib/torquebox/messaging/datamapper_marshaling.rb

@@ -0,0 +1,42 @@
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+# DataMapper::Resource uses Procs for default values and Marshal.dump 
+# does not like that. So, when sending or receiving a DataMapper::Resource
+# we need to override _dump and _load to just serialize the ID and
+# class name of the resource, and use Resource.get to _load it.
+module TorqueBox
+  module Messaging
+    module DataMapper
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      
+      def _dump( level )
+        [id, self.class].join(':')
+      end
+
+      module ClassMethods
+        def _load( string )
+          id, clazz = string.split(':')
+          Kernel.const_get(clazz).get(id)
+        end
+      end
+    end
+  end
+end

data/lib/torquebox-messaging.rb

@@ -1,14 +1,14 @@
 module TorqueboxMessaging
-  VERSION = '2.0.0.beta3'
-  MAVEN_VERSION = '2.0.0.beta3'
+  VERSION = '2.0.0.cr1'
+  MAVEN_VERSION = '2.0.0.cr1'
 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__) + '/hornetq-core-2.2.11.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-jms-2.2.11.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.'

data/spec/backgroundable_spec.rb

@@ -19,7 +19,7 @@ describe TorqueBox::Messaging::Backgroundable do
   before(:all) do
     @util = TorqueBox::Messaging::Backgroundable::Util
   end
-  
+
   describe "always_background" do
     it "should be able to handle mutliple methods" do
       MyTestModel.always_background :foo, :bar

data/spec/datamapper_marshaling_spec.rb

@@ -0,0 +1,25 @@
+require 'torquebox/messaging/datamapper_marshaling'
+
+class MyTestDataMapperModel
+  include TorqueBox::Messaging::DataMapper
+  def id ; 100 end
+end
+
+describe TorqueBox::Messaging::DataMapper do
+
+  describe "DataMapper::Resource" do
+    it "should _dump as a string with the ID and class name" do
+      model = MyTestDataMapperModel.new
+      id, clazz = model._dump(-1).split(':')
+      clazz.should == model.class.name
+      id.should == "100"
+    end
+
+    it "should call Resource.get with the id on Marshal.load" do
+      MyTestDataMapperModel.should_receive(:get).with("100")
+      Marshal.load(Marshal.dump(MyTestDataMapperModel.new))
+    end
+  end
+
+end
+

data/spec/destination_spec.rb

@@ -10,6 +10,10 @@ java_import org.hornetq.jms.server.impl.JMSServerManagerImpl
 
 describe TorqueBox::Messaging::Destination do
 
+  after(:each) do
+    TorqueBox::Registry.registry.clear
+  end
+
   it "should return its name for to_s" do
     queue = TorqueBox::Messaging::Queue.new("/queues/foo")
     queue.name.should == "/queues/foo"
@@ -37,8 +41,28 @@ describe TorqueBox::Messaging::Destination do
   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"
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo", :host => "bart")
+    queue.connect_options[:host].should == "bart"
+  end
+
+  it "should connect with host and port if given" do
+    factory = mock("factory")
+    connection = mock("connection").as_null_object
+    factory.stub(:create_connection).and_return(connection)
+
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo", :host => "bar", :port => 123)
+    queue.connection_factory.should_receive(:create_connection_factory).with("bar", 123).and_return(factory)
+    queue.with_session { }
+  end
+
+  it "should connect with username and password if given" do
+    factory = mock("factory")
+    connection = mock("connection").as_null_object
+    factory.should_receive(:create_connection).with("ham", "biscuit").and_return(connection)
+    TorqueBox::Registry.merge!("connection-factory" => factory)
+
+    queue = TorqueBox::Messaging::Queue.new("/queues/foo", :username => "ham", :password => "biscuit")
+    queue.with_session { }
   end
 
   it "should start and stop a queue" do

metadata

@@ -2,7 +2,7 @@
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta3
+  version: 2.0.0.cr1
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-03-02 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.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,20 +31,31 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: clj
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.0.5.6
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 2.7.0
     type: :development
-    version_requirements: *id003
+    version_requirements: *id004
 description: ""
 email: 
   - torquebox-dev@torquebox.org
@@ -60,45 +71,48 @@ files:
   - 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/hornetq-core-2.2.11.Final.jar
+  - lib/hornetq-jms-2.2.11.Final.jar
   - lib/netty-3.2.6.Final.jar
-  - lib/gem_hook.rb
   - lib/org.torquebox.messaging-client.rb
+  - lib/gem_hook.rb
   - lib/torquebox/messaging.rb
-  - lib/torquebox/messaging/backgroundable.rb
-  - lib/torquebox/messaging/backgroundable_processor.rb
-  - lib/torquebox/messaging/connection.rb
-  - lib/torquebox/messaging/connection_factory.rb
   - lib/torquebox/messaging/const_missing.rb
-  - lib/torquebox/messaging/core.rb
-  - lib/torquebox/messaging/destination.rb
-  - lib/torquebox/messaging/future.rb
-  - lib/torquebox/messaging/future_responder.rb
-  - lib/torquebox/messaging/future_status.rb
-  - lib/torquebox/messaging/json_message.rb
-  - lib/torquebox/messaging/marshal_base64_message.rb
-  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/session.rb
+  - lib/torquebox/messaging/queue.rb
   - lib/torquebox/messaging/message.rb
+  - lib/torquebox/messaging/destination.rb
+  - lib/torquebox/messaging/backgroundable.rb
   - lib/torquebox/messaging/message_processor.rb
-  - lib/torquebox/messaging/processor_wrapper.rb
-  - lib/torquebox/messaging/queue.rb
-  - lib/torquebox/messaging/session.rb
-  - lib/torquebox/messaging/task.rb
   - lib/torquebox/messaging/text_message.rb
+  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/task.rb
+  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/xa_session.rb
+  - lib/torquebox/messaging/processor_wrapper.rb
+  - lib/torquebox/messaging/future_status.rb
+  - lib/torquebox/messaging/backgroundable_processor.rb
+  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/future_responder.rb
+  - lib/torquebox/messaging/clojure_message.rb
+  - lib/torquebox/messaging/datamapper_marshaling.rb
+  - lib/torquebox/messaging/xa_connection_factory.rb
+  - lib/torquebox/messaging/connection_factory.rb
+  - lib/torquebox/messaging/marshal_base64_message.rb
+  - lib/torquebox/messaging/core.rb
   - lib/torquebox/messaging/topic.rb
   - lib/torquebox/messaging/xa_connection.rb
-  - lib/torquebox/messaging/xa_connection_factory.rb
-  - lib/torquebox/messaging/xa_session.rb
+  - lib/torquebox/messaging/future.rb
   - lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
+  - spec/message_spec.rb
   - spec/backgroundable_spec.rb
   - spec/destination_spec.rb
-  - spec/future_responder_spec.rb
   - spec/future_spec.rb
+  - spec/task_spec.rb
   - spec/json_message_spec.rb
+  - spec/future_responder_spec.rb
+  - spec/datamapper_marshaling_spec.rb
   - spec/message_processor_spec.rb
-  - spec/message_spec.rb
-  - spec/task_spec.rb
 homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-messaging/
 licenses: 
   - lgpl
@@ -122,16 +136,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: TorqueBox Messaging Client
 test_files: 
+  - spec/message_spec.rb
   - spec/backgroundable_spec.rb
   - spec/destination_spec.rb
-  - spec/future_responder_spec.rb
   - spec/future_spec.rb
+  - spec/task_spec.rb
   - spec/json_message_spec.rb
+  - spec/future_responder_spec.rb
+  - spec/datamapper_marshaling_spec.rb
   - spec/message_processor_spec.rb
-  - spec/message_spec.rb
-  - spec/task_spec.rb