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

data/lib/gem_hook.rb

@@ -15,9 +15,32 @@
 # 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/client'
-require 'torquebox/messaging/task'
+begin
+  javax.jms::Session
+rescue
+  # $stderr.puts "Will not load torquebox-messaging: javax.jms.* cannot be loaded"
+  return 
+end
+
+require 'torquebox/messaging/connection_factory'
+require 'torquebox/messaging/connection'
+require 'torquebox/messaging/session'
+
+require 'torquebox/messaging/message'
+require 'torquebox/messaging/json_message'
+require 'torquebox/messaging/text_message'
+require 'torquebox/messaging/marshal_base64_message'
+require 'torquebox/messaging/marshal_message'
+
 require 'torquebox/messaging/destination'
+require 'torquebox/messaging/queue'
+require 'torquebox/messaging/topic'
+
+require 'torquebox/messaging/xa_connection_factory'
+require 'torquebox/messaging/xa_connection'
+require 'torquebox/messaging/xa_session'
+
 require 'torquebox/messaging/message_processor'
+require 'torquebox/messaging/task'
 require 'torquebox/messaging/backgroundable'
-require 'torquebox/messaging/web_sockets_processor'
+require 'torquebox/messaging/processor_wrapper'

data/lib/torquebox-messaging.rb

@@ -1,40 +1,10 @@
 module TorqueboxMessaging
-  VERSION = '1.1.1'
-  MAVEN_VERSION = '1.1.1'
+  VERSION = '2.0.0.beta1'
+  MAVEN_VERSION = '2.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.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__) + '/jboss-logging-3.0.0.Beta4.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-reflect-2.2.0.GA.jar'
-  require File.dirname(__FILE__) + '/jbossxb-2.0.3.GA.jar'
-  require File.dirname(__FILE__) + '/xml-apis-1.3.04.jar'
-  require File.dirname(__FILE__) + '/xercesImpl-2.9.1.jar'
-  require File.dirname(__FILE__) + '/dtdparser-1.21.jar'
-  require File.dirname(__FILE__) + '/activation-1.1.jar'
-  require File.dirname(__FILE__) + '/jaxb-api-2.1.9.jar'
-  require File.dirname(__FILE__) + '/torquebox-base-spi.jar'
-  require File.dirname(__FILE__) + '/jruby-complete-1.6.3.jar'
-  require File.dirname(__FILE__) + '/torquebox-base-metadata.jar'
-  require File.dirname(__FILE__) + '/torquebox-base-core.jar'
-  require File.dirname(__FILE__) + '/picketbox-bare-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/identity-spi-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/authorization-spi-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/acl-spi-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/jbosssx-bare-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/picketbox-identity-impl-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/picketbox-spi-bare-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/picketbox-acl-impl-3.0.0.CR2.jar'
-  require File.dirname(__FILE__) + '/jbossxacml-2.0.5.CR1.jar'
-  require File.dirname(__FILE__) + '/torquebox-mc-support.jar'
-  require File.dirname(__FILE__) + '/torquebox-messaging-core.jar'
 rescue LoadError
   puts 'JAR-based gems require JRuby to load. Please visit www.jruby.org.'
   raise

data/lib/torquebox/messaging.rb

@@ -1,3 +1,19 @@
+# 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.
 
 begin
   require 'torquebox-messaging'

data/lib/torquebox/messaging/backgroundable.rb

@@ -1,38 +1,53 @@
 # 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/destination'
+require 'torquebox/messaging/queue'
 require 'torquebox/messaging/future'
+require 'torquebox/messaging/task'
 require 'torquebox/messaging/future_status'
+require 'torquebox/injectors'
 
 module TorqueBox
   module Messaging
+
+    # Backgroundable provides mechanism for executing an object's
+    # methods asynchronously.
     module Backgroundable
       def self.included(base)
         base.extend(ClassMethods)
         base.send(:include, FutureStatus)
       end
 
+      # Allows you to background any method that has not been marked
+      # as a backgrounded method via {ClassMethods#always_background}.
+      # @param [Hash] options that are passed through to
+      #   {TorqueBox::Messaging::Destination#publish}
+      # @return [Future]
       def background(options = { })
         BackgroundProxy.new(self, options)
       end
 
       module ClassMethods
 
+        # Marks methods to always be backgrounded. Takes one or more
+        # method symbols, and an optional options hash as the final
+        # argument. The options allow you to set publish options for
+        # each call.
+        # see TorqueBox::Messaging::Destination#publish
         def always_background(*methods)
           options = methods.last.is_a?(Hash) ? methods.pop : {}
           @__backgroundable_methods ||= {}
@@ -103,21 +118,23 @@ module TorqueBox
       end
 
       module Util
-        QUEUE_NAME = "/queues/torquebox/#{ENV['TORQUEBOX_APP_NAME']}/backgroundable"
-
+        extend TorqueBox::Injectors
+        
         class << self
           def publish_message(receiver, method, args, options = { })
-            queue = Queue.new(QUEUE_NAME)
+            queue_name = Task.queue_name( "torquebox_backgroundable" )
+            queue = Queue.new( queue_name )
             future = Future.new( queue )
-            queue.publish({:receiver => receiver,
-                            :future_id => future.correlation_id,
-                            :future_queue => QUEUE_NAME,
-                            :method => method,
-                            :args => args}, options)
-
+            options[:encoding] = :marshal
+            queue.publish( {:receiver => receiver,
+                             :future_id => future.correlation_id,
+                             :future_queue => queue_name,
+                             :method => method,
+                             :args => args}, options )
+            
             future
-          rescue javax.naming.NameNotFoundException => ex
-            raise RuntimeError.new("The backgroundable queue is not available. Did you disable it by setting its concurrency to 0?")
+          rescue javax.jms.InvalidDestinationException => ex
+            raise RuntimeError.new("The Backgroundable queue is not available. Did you disable it by setting its concurrency to 0?")
           end
 
           def instance_methods_include?(klass, method)

data/lib/torquebox/messaging/backgroundable_processor.rb

@@ -0,0 +1,32 @@
+# 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/message_processor'
+require 'torquebox/messaging/const_missing'
+require 'torquebox/messaging/future_responder'
+
+module TorqueBox
+  module Messaging
+    class BackgroundableProcessor < MessageProcessor
+      def on_message(hash)
+        FutureResponder.new( Queue.new( hash[:future_queue] ), hash[:future_id] ).respond do
+          hash[:receiver].send(hash[:method], *hash[:args])
+        end
+      end
+    end
+  end
+end

data/lib/torquebox/messaging/connection.rb

@@ -0,0 +1,127 @@
+# 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/injectors'
+require 'torquebox/messaging/session'
+
+module TorqueBox
+  module Messaging
+    class Connection
+      include TorqueBox::Injectors
+
+      def initialize(jms_connection)
+        @jms_connection = jms_connection
+        @tm = inject('transaction-manager')
+      end
+
+      def start
+        @jms_connection.start
+      end
+
+      def close
+        @jms_connection.close
+      end
+
+      def client_id
+        @jms_connection.client_id
+      end
+
+      def client_id=(client_id)
+        @jms_connection.client_id = client_id
+      end
+      
+      def with_session(enlist_tx = true)
+        if !enlist_tx || (current.nil? && !transaction)
+          begin
+            yield activate( create_session )
+          ensure
+            deactivate
+          end
+        elsif transaction && (!current.respond_to?(:transaction) || current.transaction != transaction)
+          yield activate( create_xa_session )
+        else
+          yield( current )
+        end
+      end
+
+      def sessions
+        Thread.current[:session] ||= []
+      end
+      def current
+        sessions.last
+      end
+      def activate(session)
+        sessions.push(session) && current
+      end
+      def deactivate
+        sessions.pop.close
+      end
+
+      def transaction
+        @tm && @tm.transaction
+      end
+
+      def create_xa_session
+        jms_session = @jms_connection.create_xa_session()
+        transaction.enlist_resource( jms_session.xa_resource )
+        session = TransactedSession.new( jms_session, transaction, self )
+        transaction.registerSynchronization( session )
+        session
+      end
+
+      def create_session
+        Session.new( @jms_connection.create_session( false, Session::AUTO_ACK ) )
+      end
+
+    end
+    
+    class TransactedSession < Session
+      include javax.transaction.Synchronization
+      attr_reader :transaction
+
+      def initialize( jms_session, transaction, connection )
+        super( jms_session )
+        @transaction = transaction
+        @connection = connection.extend(TransactedConnection)
+      end
+
+      def close
+        # eat the close, until tx completes
+      end
+
+      def beforeCompletion
+        # required interface
+      end
+
+      def afterCompletion(status)
+        @connection.deactivate
+        @connection.complete!
+      end
+    end
+
+    module TransactedConnection
+      def close
+        super if @complete
+      end
+      def complete!
+        @complete = true
+        close
+      end
+    end
+
+  end
+end

data/lib/torquebox/messaging/connection_factory.rb

@@ -0,0 +1,70 @@
+# 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 'java'
+require 'torquebox/messaging/connection'
+
+module TorqueBox
+  module Messaging
+    class ConnectionFactory
+
+      attr_reader :internal_connection_factory
+      
+      def self.new(internal_connection_factory = nil)
+        return internal_connection_factory if internal_connection_factory.is_a?( ConnectionFactory )
+        super
+      end
+
+      def initialize(internal_connection_factory = nil)
+        @internal_connection_factory = internal_connection_factory
+      end
+
+      def with_new_connection(client_id = nil, &block)
+        connection = create_connection
+        connection.client_id = client_id
+        connection.start
+        begin
+          result = block.call( connection )
+        ensure
+          connection.close
+        end
+        return result
+      end
+
+      def create_connection()
+        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 ) }
+          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 )
+        end
+
+        Connection.new( @internal_connection_factory.create_connection )
+      end
+
+
+      def to_s
+        "[ConnectionFactory: internal_connection_factory=#{internal_connection_factory}]"
+      end
+
+    end
+  end
+end

data/lib/torquebox/messaging/const_missing.rb

@@ -0,0 +1,28 @@
+# 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.
+
+unless defined?(ActiveSupport)
+  $stderr.puts "WARN: Defining const_missing"
+  
+  def Object.const_missing(name)
+    file = org.torquebox.core.util.StringUtils.underscore(name)
+    require file
+    result = const_get(name)
+    return result if result
+    raise "Class not found: #{name}"
+  end
+end