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

data/lib/torquebox-messaging.rb

@@ -1,14 +1,14 @@
 module TorqueboxMessaging
-  VERSION = '2.0.0.cr1'
-  MAVEN_VERSION = '2.0.0.cr1'
+  VERSION = '2.0.0'
+  MAVEN_VERSION = '2.0.0'
 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.11.Final.jar'
-  require File.dirname(__FILE__) + '/hornetq-jms-2.2.11.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-core-2.2.13.Final.jar'
+  require File.dirname(__FILE__) + '/hornetq-jms-2.2.13.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/lib/torquebox/messaging/backgroundable.rb

@@ -27,6 +27,14 @@ module TorqueBox
     # Backgroundable provides mechanism for executing an object's
     # methods asynchronously.
     module Backgroundable
+      NEWRELIC_AVAILABLE ||= 
+        begin
+          require 'newrelic_rpm'
+          true
+        rescue LoadError
+          false
+        end
+
       def self.included(base)
         base.extend(ClassMethods)
         base.send(:include, FutureStatus)
@@ -96,6 +104,7 @@ module TorqueBox
             if privatize || protect
               send((privatize ? :private : :protected), method, sync_method, async_method)
             end
+
           end
         ensure
           @__backgroundable_methods[method][:backgrounding] = nil

data/lib/torquebox/messaging/backgroundable_processor.rb

@@ -22,11 +22,28 @@ 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
+          # TORQUE-741 allow always_background methods to report as background tasks in NewRelic
+          begin
+            if TorqueBox::Messaging::Backgroundable::NEWRELIC_AVAILABLE
+              class << hash[:receiver]
+                include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+                add_transaction_tracer hash[:method], :name => hash[:method].sub("__sync_", ""), :category => :task
+              end
+            end
+          rescue
+            log.error "Error loading New Relic for backgrouded process #{hash[:method]}"
+          end
           hash[:receiver].send(hash[:method], *hash[:args])
         end
       end
+
+      private
+      def log
+        @logger ||= TorqueBox::Logger.new(self.class)
+      end
     end
   end
 end

data/spec/backgroundable_spec.rb

@@ -55,6 +55,7 @@ describe TorqueBox::Messaging::Backgroundable do
       @util.protected_instance_methods_include?(MyTestModel, '__async_some_peeking').should be_true
       @util.protected_instance_methods_include?(MyTestModel, '__sync_some_peeking').should be_true
     end
+
   end
 
   describe "a method handled asynchronously" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 2.0.0.cr1
+  prerelease: 
+  version: 2.0.0
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-31 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.cr1
+            version: 2.0.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.cr1
+            version: 2.0.0
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -56,6 +56,17 @@ dependencies:
             version: 2.7.0
     type: :development
     version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: newrelic_rpm
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 3.3.2
+    type: :development
+    version_requirements: *id005
 description: ""
 email: 
   - torquebox-dev@torquebox.org
@@ -71,49 +82,49 @@ 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.11.Final.jar
-  - lib/hornetq-jms-2.2.11.Final.jar
+  - lib/hornetq-core-2.2.13.Final.jar
+  - lib/hornetq-jms-2.2.13.Final.jar
   - lib/netty-3.2.6.Final.jar
   - lib/org.torquebox.messaging-client.rb
   - lib/gem_hook.rb
   - lib/torquebox/messaging.rb
-  - lib/torquebox/messaging/const_missing.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/core.rb
+  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/future_status.rb
   - lib/torquebox/messaging/text_message.rb
-  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/marshal_base64_message.rb
   - lib/torquebox/messaging/task.rb
-  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/xa_connection_factory.rb
+  - lib/torquebox/messaging/queue.rb
+  - lib/torquebox/messaging/clojure_message.rb
+  - lib/torquebox/messaging/backgroundable_processor.rb
   - lib/torquebox/messaging/xa_session.rb
+  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/future.rb
+  - lib/torquebox/messaging/message.rb
+  - lib/torquebox/messaging/topic.rb
+  - lib/torquebox/messaging/const_missing.rb
+  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/connection_factory.rb
+  - lib/torquebox/messaging/backgroundable.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/session.rb
+  - lib/torquebox/messaging/message_processor.rb
   - lib/torquebox/messaging/xa_connection.rb
-  - lib/torquebox/messaging/future.rb
+  - lib/torquebox/messaging/datamapper_marshaling.rb
+  - lib/torquebox/messaging/destination.rb
   - lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
-  - spec/message_spec.rb
+  - spec/future_responder_spec.rb
   - spec/backgroundable_spec.rb
-  - spec/destination_spec.rb
-  - spec/future_spec.rb
   - spec/task_spec.rb
-  - spec/json_message_spec.rb
-  - spec/future_responder_spec.rb
+  - spec/future_spec.rb
   - spec/datamapper_marshaling_spec.rb
+  - spec/message_spec.rb
   - spec/message_processor_spec.rb
-homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-messaging/
+  - spec/json_message_spec.rb
+  - spec/destination_spec.rb
+homepage: http://torquebox.org/
 licenses: 
   - lgpl
 post_install_message: 
@@ -130,9 +141,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -141,12 +152,12 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Messaging Client
 test_files: 
-  - spec/message_spec.rb
+  - spec/future_responder_spec.rb
   - spec/backgroundable_spec.rb
-  - spec/destination_spec.rb
-  - spec/future_spec.rb
   - spec/task_spec.rb
-  - spec/json_message_spec.rb
-  - spec/future_responder_spec.rb
+  - spec/future_spec.rb
   - spec/datamapper_marshaling_spec.rb
+  - spec/message_spec.rb
   - spec/message_processor_spec.rb
+  - spec/json_message_spec.rb
+  - spec/destination_spec.rb