torquebox-messaging 1.1.1-java → 2.0.0.beta1-java

data/lib/torquebox/messaging/core.rb

@@ -0,0 +1,27 @@
+# Copyright 2008-2011 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 'torquebox/messaging/core/connection_factory'
+require 'torquebox/messaging/core/connection'
+require 'torquebox/messaging/core/session'
+require 'torquebox/messaging/core/message'
+require 'torquebox/messaging/core/destination'
+require 'torquebox/messaging/core/queue'
+require 'torquebox/messaging/core/topic'
+require 'torquebox/messaging/core/live_destination'
+require 'torquebox/messaging/core/live_queue'
+require 'torquebox/messaging/core/live_topic'

data/lib/torquebox/messaging/destination.rb

@@ -1,90 +1,80 @@
 # Copyright 2008-2011 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 'torquebox/kernel'
-require 'torquebox/messaging/client'
-
+require 'torquebox/injectors'
+require 'torquebox/messaging/session'
+require 'torquebox/messaging/connection_factory'
 require 'torquebox/messaging/ext/javax_jms_queue_browser'
 
 module TorqueBox
   module Messaging
-
-    module Destination
+    class Destination
+      include TorqueBox::Injectors
       include Enumerable
-
-      attr_reader :name
-      attr_reader :connect_options
-      attr_reader :enumerable_options
       
+      attr_reader :connection_factory
+      attr_reader :name
+      attr_accessor :enumerable_options
+      attr_accessor :connect_options
+
       PRIORITY_MAP = {
-        :low => 1,
-        :normal => 4,
-        :high => 7,
-        :critical => 9
+          :low => 1,
+          :normal => 4,
+          :high => 7,
+          :critical => 9
       }
 
-      def initialize(name, connect_options=nil, enumerable_options=nil)
-        @name = name
-        @connect_options = connect_options || {}
-        @enumerable_options = enumerable_options || {}
+      def _dump(depth)
+        return self.name.queue_name if self.name.respond_to?( :queue_name )
+        self.name.to_s
       end
 
-      def publish(message, options = {})
-        wait_for_destination(options[:startup_timeout]) {
-          Client.connect(@connect_options) do |session|
-            session.publish name, message, normalize_options(options)
-            session.commit if session.transacted?
-          end
-        }
+      def self._load(str)
+       self.new( str )
       end
 
-      def receive(options={})
-        result = nil
-        wait_for_destination(options[:startup_timeout]) {
-          Client.connect(@connect_options) do |session|
-            result = session.receive( name, options )
-            session.commit if session.transacted?
-          end
-        }
-        result
+      def initialize(destination, connection_factory = __inject__( 'connection-factory' ))
+        @name                = destination
+        @connection_factory  = ConnectionFactory.new( connection_factory )
+        @connect_options     = {}
+        @enumerable_options  = {}
       end
 
-      def start
-        TorqueBox::Kernel.lookup("JMSServerManager") do |server|
-          destination.name = name
-          destination.server = server
-          destination.create
+      def publish(message, options = {})
+        wait_for_destination(options[:startup_timeout]) do
+          with_session(options) do |session|
+            session.publish self, message, normalize_options(options)
+          end
         end
       end
-      alias_method :create, :start
 
-      def destroy
-        TorqueBox::Kernel.lookup("JMSServerManager") do |server|
-          destination.name = name
-          destination.server = server
-          destination.destroy
+      def receive(options = {})
+        wait_for_destination(options[:startup_timeout]) do
+          with_session(options) do |session|
+            session.receive self, options
+          end
         end
       end
 
       def each(&block)
         wait_for_destination do
-          Client.connect(@connect_options) do |session|
-            destination = session.lookup_destination( name )
-            browser = session.create_browser( destination, @enumerable_options[:selector] )
+          with_session do |session|
+            destination = session.java_destination( self )
+            browser = session.create_browser( destination, enumerable_options[:selector] )
             begin
               browser.each(&block)
             ensure
@@ -94,92 +84,59 @@ module TorqueBox
         end
       end
 
-      def to_s
-        name
-      end
-
-      protected
-
-      def normalize_options(options)
-        if options.has_key?(:persistent)
-          options[:delivery_mode] =
-            options.delete(:persistent) ? javax.jms::DeliveryMode.PERSISTENT : javax.jms::DeliveryMode.NON_PERSISTENT
-        end
-
-        if options.has_key?(:priority)
-          if PRIORITY_MAP[options[:priority]]
-            options[:priority] = PRIORITY_MAP[options[:priority]]
-          elsif (0..9) === 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(',')}")
+      def with_session(opts = {})
+        transactional = opts.fetch(:tx, true)
+        connection_factory.with_new_connection( connect_options[:client_id] ) do |connection|
+          connection.with_session(transactional) do |session|
+            yield session
           end
         end
-
-        options
       end
 
       def wait_for_destination(timeout=nil, &block)
-        timeout ||= 30000 # 30s default
+        timeout ||= 30_000 # 30s default
         start = Time.now
         begin
           block.call
-        rescue javax.naming.NameNotFoundException => ex
+        rescue javax.naming.NameNotFoundException, javax.jms.JMSException
           elapsed = (Time.now - start) * 1000
           if elapsed > timeout
-            raise ex
+            raise
           else
             sleep(0.1)
             retry
           end
         end
       end
-    end
 
-    class Queue
-      include Destination
-      def destination
-        @destination ||= Java::org.torquebox.messaging.core::ManagedQueue.new
-      end
+      def normalize_options(options)
+        if options.has_key?(:persistent)
+          options[:delivery_mode] =
+            options.delete(:persistent) ? javax.jms::DeliveryMode.PERSISTENT : javax.jms::DeliveryMode.NON_PERSISTENT
+        end
 
-      def publish_and_receive(message, options={})
-        result = nil
-        wait_for_destination(options[:startup_timeout]) {
-          Client.connect(@connect_options) do |session|
-            result = session.publish_and_receive(name, message,
-                                                 normalize_options(options))
-            session.commit if session.transacted?
+        if options.has_key?(:priority)
+          if PRIORITY_MAP[options[:priority]]
+            options[:priority] = PRIORITY_MAP[options[:priority]]
+          elsif (0..9) === 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
-        }
-        result
-      end
+        end
 
-      def receive_and_publish(options={}, &block)
-        wait_for_destination(options[:startup_timeout]) {
-          Client.connect(@connect_options) do |session|
-            session.receive_and_publish(name, normalize_options(options), &block)
-            session.commit if session.transacted?
-          end
-        }
+        options
       end
-    end
 
-    class Topic
-      include Destination
-      DEFAULT_SUBSCRIBER_NAME = 'subscriber-1'
+      def enumerable_options
+        @enumerable_options ||= { }
+        @enumerable_options
+      end
       
-      def destination
-        @destination ||= Java::org.torquebox.messaging.core::ManagedTopic.new
+      def to_s 
+        name
       end
 
-      def unsubscribe(name = DEFAULT_SUBSCRIBER_NAME, options = {})
-        wait_for_destination(options[:startup_timeout]) {
-          Client.connect(@connect_options) do |session|
-            session.unsubscribe(name)
-          end
-        }
-      end
     end
-
   end
 end

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

@@ -15,13 +15,11 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-
-
 module javax.jms::QueueBrowser
   include Enumerable
   
   def each(&block)
-    enumeration.each(&block)
+    enumeration.map{ |m| TorqueBox::Messaging::Message.new(m) }.each(&block)
   end
 end
 

data/lib/torquebox/messaging/future_responder.rb

@@ -71,8 +71,8 @@ module TorqueBox
         self.result = yield 
       rescue Exception => e
         self.error = e
-        puts "FutureResponder#respond: An error occured: ", e
-        puts e.backtrace.join( "\n" )
+        $stderr.puts "FutureResponder#respond: An error occured: ", e
+        $stderr.puts e.backtrace.join( "\n" )
       end
 
       # Convenience method that returns the thread local
@@ -95,11 +95,14 @@ module TorqueBox
         message[:error] = @error if @error
         message[:result] = @result if @result_set
         @queue.publish( message,
-                        {
-                          :correlation_id => @correlation_id,
-                          :ttl => @message_ttl,
-                          :priority => priority
-                        } )
+                        :correlation_id => @correlation_id,
+                        :ttl => @message_ttl,
+                        :priority => priority,
+                        :encoding => :marshal,
+                        :tx => false # can't be a part of the task's tx!
+                        )
+      rescue TypeError => ex
+        $stderr.puts "FutureResponder#send_response: Warning: unable to marshal #{@result.inspect}"
       end
     end
   end

data/lib/torquebox/messaging/json_message.rb

@@ -0,0 +1,50 @@
+# Copyright 2008-2011 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.
+
+module TorqueBox
+  module Messaging
+    class JSONMessage < Message
+      ENCODING = :json
+      JMS_TYPE = :text
+
+      def require_json
+        # We can't ship our own json, as it may collide with the gem
+        # requirement for the app.
+        if !defined?( JSON )
+          begin
+            require 'json'
+          rescue LoadError => ex
+            raise RuntimeError.new( "Unable to load the json gem. Verify that is installed and in your Gemfile (if using Bundler)" )
+          end
+        end
+      end
+      
+      def encode(message)
+        require_json 
+        @jms_message.text = JSON.fast_generate( message ) unless message.nil?
+      end
+
+      def decode
+        require_json 
+        JSON.parse( @jms_message.text, :symbolize_names => true ) unless @jms_message.text.nil?
+      end
+
+    end
+
+    Message.register_encoding( JSONMessage )
+  end
+end

data/lib/torquebox/messaging/marshal_base64_message.rb

@@ -0,0 +1,44 @@
+# Copyright 2008-2011 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 'base64'
+
+module TorqueBox
+  module Messaging
+    class MarshalBase64Message < Message
+      ENCODING = :marshal_base64
+      JMS_TYPE = :text
+      
+      def encode(message)
+        unless message.nil?
+          marshalled = Marshal.dump( message )
+          @jms_message.text = Base64.encode64( marshalled )
+        end
+      end
+
+      def decode
+        unless @jms_message.text.nil?
+          serialized = Base64.decode64( @jms_message.text )
+          Marshal.restore( serialized )
+        end
+      end
+
+    end
+
+    Message.register_encoding( MarshalBase64Message )
+  end
+end

data/lib/torquebox/messaging/marshal_message.rb

@@ -0,0 +1,43 @@
+# Copyright 2008-2011 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.
+
+module TorqueBox
+  module Messaging
+    class MarshalMessage < Message
+      ENCODING = :marshal
+      JMS_TYPE = :bytes
+      
+      def encode(message)
+        unless message.nil?
+          marshalled = Marshal.dump( message )
+          @jms_message.write_bytes( marshalled.to_java_bytes )
+        end
+      end
+
+      def decode
+        if (length = @jms_message.get_body_length) > 0
+          bytes = Java::byte[length].new
+          @jms_message.read_bytes( bytes )
+          Marshal.restore( String.from_java_bytes( bytes ) )
+        end
+      end
+
+    end
+
+    Message.register_encoding( MarshalMessage )
+  end
+end