torquebox-core 3.1.1-java → 3.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be3ba463531fcd70b806b0baf8e694488dd99cd
-  data.tar.gz: c48a7db5f479c4b1da954017dde101af49fece11
+  metadata.gz: a2560f2827963d835f788588b54f98b4fc058e67
+  data.tar.gz: 4522465723d2b02e073a6e01bd5a73222814aa0c
 SHA512:
-  metadata.gz: 38b9b09af388adbb216106dd55dad9b2c1c5ea812be5bc695227ff206c8a7bcf67a2bc279a9e0f175babdeba30517d11520d23e94c0e40e4c7058a9715e3cc19
-  data.tar.gz: e8362d10b0bfe9a98bda8eca4f755608bda0ffeb88e0a5aa7c24ddccb2f60fdcb8e9ad05bf847568a5dea223b55e7354c6781001b5a3b86475db0223becde294
+  metadata.gz: 6185c0958ee3770731507c5dd8f90f611cff7523c945712e9abc7448b7cfc00b64e20d6d340275121f18f3d48c340cfecb9b3879b9d2fd4d441d1bad8b4a6ed9
+  data.tar.gz: 5c20c34c9bdf9416b7948144d1182dd628cc7239230d037b6af5a0250561fdc906a8038e05fc8af5854580cf135788e6c3ab7ec5127a3626b76262e4f879a206

data/lib/torquebox-core.rb

@@ -1,6 +1,6 @@
 module TorqueboxCore
-  VERSION = '3.1.1'
-  MAVEN_VERSION = '3.1.1'
+  VERSION = '3.1.2'
+  MAVEN_VERSION = '3.1.2'
 end
 begin
   require 'java'

data/lib/torquebox/injectors.rb

@@ -24,7 +24,8 @@ module TorqueBox
   class InjectionError < StandardError
   end
 
-  def self.fetch(something)
+  def self.fetch(something,options={})
+    timeout = options[:timeout] || 45
     unless TorqueBox::Registry.has_key?(something.to_s)
       handler_registry = TorqueBox::ServiceRegistry['torquebox.core.injection.injectable-handler-registry']
       # handler_registry should only be nil when running outside of
@@ -38,7 +39,7 @@ module TorqueBox
                                                  TorqueBox::Registry['deployment-unit'])
       service = TorqueBox::ServiceRegistry.registry.getService(service_name)
       raise InjectionError.new("Service not found for injection - #{something}") if service.nil?
-      state = TorqueBox::MSC.wait_for_service_to_start(service, 45)
+      state = TorqueBox::MSC.wait_for_service_to_start(service, timeout)
       raise InjectionError.new("Injected service failed to start - #{service_name}") if state != 'UP'
       value = service.value
       raise InjectionError.new("Injected service had no value - #{service_name}") if value.nil?
@@ -55,8 +56,8 @@ module TorqueBox
 
   module Injectors
 
-    def fetch(something)
-      TorqueBox.fetch(something)
+    def fetch(something,options={})
+      TorqueBox.fetch(something,options)
     end
     alias_method :__inject__, :fetch
 

data/lib/torquebox/logger.rb

@@ -54,7 +54,6 @@ module TorqueBox
     org.jboss.logging::Logger
   rescue ::NameError
     Logger = FallbackLogger
-    return
   end
 
   class Logger
@@ -134,5 +133,5 @@ module TorqueBox
       [ args[0] || (block && block.call) ].compact
     end
 
-  end
+  end unless defined?(TorqueBox::Logger)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-core
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -63,28 +63,28 @@ files:
 - lib/torquebox-core.jar
 - lib/torquebox-core.rb
 - lib/gem_hook.rb
-- lib/torquebox/component_manager.rb
-- lib/torquebox/kernel.rb
-- lib/torquebox/core.rb
-- lib/torquebox/service_registry.rb
-- lib/torquebox/scheduled_job.rb
-- lib/torquebox/injectors.rb
-- lib/torquebox/logger.rb
 - lib/torquebox/registry.rb
 - lib/torquebox/codecs.rb
-- lib/torquebox/msc.rb
+- lib/torquebox/scheduled_job.rb
 - lib/torquebox/service.rb
+- lib/torquebox/service_registry.rb
+- lib/torquebox/logger.rb
+- lib/torquebox/component_manager.rb
+- lib/torquebox/core.rb
+- lib/torquebox/msc.rb
+- lib/torquebox/injectors.rb
+- lib/torquebox/kernel.rb
 - lib/torquebox/codecs/marshal_base64.rb
-- lib/torquebox/codecs/edn.rb
 - lib/torquebox/codecs/marshal.rb
-- lib/torquebox/codecs/marshal_smart.rb
 - lib/torquebox/codecs/json.rb
-- spec/scheduled_job_spec.rb
-- spec/injectors_spec.rb
-- spec/logger_spec.rb
+- lib/torquebox/codecs/edn.rb
+- lib/torquebox/codecs/marshal_smart.rb
+- spec/kernel_spec.rb
 - spec/service_registry_spec.rb
 - spec/codecs_spec.rb
-- spec/kernel_spec.rb
+- spec/logger_spec.rb
+- spec/scheduled_job_spec.rb
+- spec/injectors_spec.rb
 homepage: http://torquebox.org/
 licenses:
 - Public Domain
@@ -110,9 +110,9 @@ signing_key:
 specification_version: 4
 summary: TorqueBox Core Gem
 test_files:
-- spec/scheduled_job_spec.rb
-- spec/injectors_spec.rb
-- spec/logger_spec.rb
+- spec/kernel_spec.rb
 - spec/service_registry_spec.rb
 - spec/codecs_spec.rb
-- spec/kernel_spec.rb
+- spec/logger_spec.rb
+- spec/scheduled_job_spec.rb
+- spec/injectors_spec.rb