torquebox-core 4.0.0.beta2-java → 4.0.0.beta3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 064ab706a2d83b43252af08da71d29b9770a95cc
-  data.tar.gz: e63a2845b426855b3ba7fef611558bb759a5273d
+  metadata.gz: ddd01042745f0acb74e5cd5c698edfcd5dfbbd06
+  data.tar.gz: 1c64810b337f920ea9dc8ff1bad6e31a99853899
 SHA512:
-  metadata.gz: eac2bfbda2e5404d0a2bb9fef0ec46b7ad760d9c8a1e79e19765b9a4728ebb0d728842835695a0c3165cc72bfde85e19eaaf3a55890767a632697dcfadaa0d3c
-  data.tar.gz: f8c2cdf6d27a2250742a5d272dc3a389caebe0fc4760703aedd6a6c3a74f6fb8f0706f151cb9f3c9393465892db787f4a61c7450514caa70a21dce4d890d1556
+  metadata.gz: d7e9a657df452f20ec5781e76b9b5f2bb3ef7b5f6bceb8071bee480bc14936fdf243bc0b0b0d7e5cb42bcf890b65002b93153640bc2e0f71081dcc2d3415c803
+  data.tar.gz: aa0c26f15d5fc56cf11454fc0d1eaefd89c1306358c27b2c461adf6412d8246801dc63ed7524846661f56865940d5dfafafd962b73ed65672ca64281af57b2ce

data/lib/torquebox-core.rb

@@ -46,7 +46,7 @@ module TorqueBox
 
   class << self
     def in_wildfly?
-      !org.projectodd.wunderboss.WunderBoss.options.get('wildfly-service').nil?
+      org.projectodd.wunderboss.WunderBoss.inWildFly
     end
   end
 end
@@ -60,6 +60,7 @@ require 'torquebox/cli'
 require 'torquebox/cli/archive'
 require 'torquebox/cli/jar'
 require 'torquebox/cli/war'
+require 'torquebox/daemon'
 require 'torquebox/logger'
 require 'torquebox/option_utils'
 require 'torquebox/version'

data/lib/torquebox/cli.rb

@@ -35,7 +35,7 @@ module TorqueBox
     end
 
     def initialize(argv)
-      @argv = argv
+      @argv = argv = argv.dup
       require_torquebox_gems
       options = {}
       @extension = TorqueBox::CLI.extensions[argv.first]

data/lib/torquebox/cli/archive.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'optparse'
+require 'rbconfig'
 
 module TorqueBox
   class CLI
@@ -41,11 +42,13 @@ module TorqueBox
           # "java -jar foo.jar -S torquebox help" work without quotes
           arg = ([arg] + @argv).join(' ')
           app_jar = java.lang.System.get_property("torquebox.app_jar")
+          lib_dir = RbConfig::CONFIG['libdir']
           load_path = $LOAD_PATH.map { |entry| "-I#{entry}" }.join(' ')
           jars = Dir.glob("../jars/*.jar").map { |j| "-r#{j}" }.join(' ')
           # PWD is $tmpdir/app and jruby.jar is $tmpdir/jars/jruby.jar
           Kernel.exec("java -Dtorquebox.app_jar=#{app_jar} \
                       -Djava.io.tmpdir=#{java.lang.System.get_property('java.io.tmpdir')} \
+                      -Djruby.lib=#{lib_dir} \
                       -jar ../jars/jruby.jar #{load_path} -r#{app_jar} \
                       #{jars} -rbundler/setup -rtorquebox/cli/archive_cleaner \
                       -S #{arg}")

data/lib/torquebox/cli/jar.rb

@@ -163,11 +163,27 @@ module TorqueBox
                   :pattern => "/*",
                   :jar_prefix => "jruby/bin")
         add_jar(jar_builder, "#{rb_config['libdir']}/jruby.jar")
+        add_default_gems(jar_builder)
+      end
+
+      def add_default_gems(jar_builder)
+        default_spec_suffix = "specifications/default"
+        default_spec_dir = "#{Gem.default_dir}/#{default_spec_suffix}"
+        jar_prefix = "jruby/lib/ruby/gems/shared"
+        Dir.glob("#{default_spec_dir}/*.gemspec").each do |file|
+          jar_builder.add_file(File.join(jar_prefix, default_spec_suffix,
+                                         File.basename(file)), file)
+          gem_full_name = File.basename(file, ".*")
+          add_files(jar_builder,
+                    :file_prefix => "#{Gem.default_dir}/gems/#{gem_full_name}",
+                    :pattern => "/**/*",
+                    :jar_prefix => "#{jar_prefix}/gems/#{gem_full_name}")
+        end
       end
 
       def add_app_files(jar_builder, options)
         @logger.trace("Adding application files to jar...")
-        exclude = [%r{^/[^/]*\.(jar|war)}]
+        exclude = [Regexp.new("^[^/]*\.(jar|war)")]
         if options[:exclude]
           exclude += options[:exclude].map { |e| Regexp.new("^#{e}") }
         end
@@ -285,7 +301,7 @@ module TorqueBox
       def add_files(jar_builder, options)
         prefix = options[:file_prefix]
         prefix += '/' unless prefix.end_with?('/')
-        Dir.glob("#{prefix}#{options[:pattern]}").each do |file|
+        Dir.glob(File.join(prefix, options[:pattern])).each do |file|
           suffix = file.sub(prefix, '')
           excludes = [options[:exclude]].compact.flatten
           next if excludes.any? do |exclude|

data/lib/torquebox/daemon.rb

@@ -0,0 +1,157 @@
+# Copyright 2015 Red Hat, Inc, and individual contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'torquebox/option_utils'
+
+module TorqueBox
+  # Respresents a long-running daemon.
+  #
+  # When started, the daemon will execute its action in another
+  # thread, and if that thread throws an unhandled exception, the
+  # error will be logged and the action restarted.
+  #
+  # You can override this behavior by providing your own {#on_error}
+  # handler.
+  #
+  # In a WildFly cluster, daemons will be singletons, meaning only one
+  # instance of the daemon (based on its name) will run at a time.  If
+  # the node running the daemon dies, it will start on another node as
+  # long as {#start} has been called on a daemon with the same name
+  # has been started on that node. If the daemon dies due to an error
+  # and is restarted (via {#start}), then the current node will be in
+  # competition with the other nodes in the cluster to start the
+  # daemon, and it may actually start on another node.
+  class Daemon
+    include TorqueBox::OptionUtils
+    extend TorqueBox::OptionUtils
+
+    java_import org.projectodd.wunderboss::WunderBoss
+    java_import org.projectodd.wunderboss.ec::DaemonContext
+
+    DAEMON_OPTIONS = optset(DaemonContext::CreateOption,
+                            :on_error,
+                            :on_stop)
+
+    # The name of this daemon.
+    attr_reader :name
+
+    # Creates a daemon object.
+    #
+    # Optionally takes a block that is the action of the daemon. If
+    # not provided, you must extend this class and override {#action}
+    # if you want the daemon to actually do anything. The block will
+    # be passed the daemon object.
+    #
+    # @param name [String] The name of this daemon. Needs to be the
+    #   same across a cluster for :singleton to work, and must be
+    #   unique.
+    # @param options [Hash] Options for the daemon.
+    # @option options :singleton [true, false] (true)
+    # @option options :on_error [Proc] A custom error handler, will be
+    #   passed the daemon object and the error (see {#on_error})
+    # @option options :on_stop [Proc] A custom stop handler, will be
+    #   passed the daemon object (see {#on_stop})
+    # @option options :stop_timeout [Number] (30_000) Milliseconds to
+    #   wait for the daemon thread to exit when stopping.
+    def initialize(name, options = {}, &block)
+      validate_options(options, DAEMON_OPTIONS)
+      @name = name.to_s
+      @on_error_lambda = options.delete(:on_error)
+      @on_stop_lambda = options.delete(:on_stop)
+      @action_lambda = block
+      @options = options
+
+      if WunderBoss.find_component(DaemonContext.java_class, @name)
+        raise "A daemon named #{@name} already exists"
+      end
+
+      @java_daemon =
+        WunderBoss.find_or_create_component(DaemonContext.java_class,
+                                            @name,
+                                            extract_options(@options,
+                                                            DaemonContext::CreateOption))
+    end
+
+    # Starts the daemon. If :singleton and in a cluster, the daemon
+    # may not be running on the current node after calling start.
+    # @return [Daemon] self
+    def start
+      @java_daemon.set_action do
+        action
+      end
+
+      @java_daemon.set_error_callback do |_, err|
+        on_error(err)
+      end
+
+      @java_daemon.set_stop_callback do |_|
+        on_stop
+      end
+
+      @java_daemon.start
+
+      self
+    end
+
+    # Stops the daemon. This will trigger the {#on_stop} callback if
+    # this daemon is {#running?}.
+    # @return [Daemon] self
+    def stop
+      if @java_daemon
+        @java_daemon.stop
+      end
+
+      self
+    end
+
+    # true if the daemon is actually running. If not :singleton or
+    # not in a cluster, and the action hasn't exited normally,
+    # running? == {#started?}
+    def running?
+      @java_daemon && @java_daemon.is_running
+    end
+
+    # true if in the started state. May not actually be running. see
+    # {#running?}
+    def started?
+      @java_daemon && @java_daemon.is_started
+    end
+
+    # The action to perform. If you override this method, the block
+    # given to {#initialize} will be ignored. You should never call
+    # this method directly.
+    def action
+      @action_lambda.call(self) if @action_lambda
+    end
+
+    # Called when an unhandled error occurs in #{action}. If you
+    # override this method, the :on_error proc given to #{initialize}
+    # will be ignored.
+    #
+    # @param error [] The error that occurred.
+    def on_error(error)
+      if @on_error_lambda
+        @on_error_lambda.call(self, error)
+      else
+        DaemonContext::DEFAULT_ERROR_CALLBACK.notify(@java_daemon.name, error)
+        start
+      end
+    end
+
+    # Called when {#stop} is called, but only if {#started?} is true.
+    def on_stop
+      @on_stop_lambda.call(self) if @on_stop_lambda
+    end
+  end
+end

data/lib/torquebox/version.rb

@@ -14,7 +14,7 @@
 
 
 module TorqueBox
-  VERSION = '4.0.0.beta2'
-  WUNDERBOSS_VERSION = '0.8.0'
-  WILDFLY_VERSION = '9.0.1.Final'
+  VERSION = '4.0.0.beta3'
+  WUNDERBOSS_VERSION = '0.12.1'
+  WILDFLY_VERSION = '10.0.0.Final'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -74,32 +74,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/torquebox
-- lib/torquebox-core.rb
 - lib/torquebox-core.jar
-- lib/wunderboss-jars/wunderboss-wildfly-0.8.0.jar
-- lib/wunderboss-jars/wunderboss-core-0.8.0.jar
-- lib/wunderboss-jars/logback-core-1.1.2.jar
-- lib/wunderboss-jars/logback-classic-1.1.2.jar
-- lib/wunderboss-jars/slf4j-api-1.7.5.jar
-- lib/wunderboss-jars/wunderboss-ruby-0.8.0.jar
+- lib/torquebox-core.rb
+- lib/wunderboss-jars/wunderboss-wildfly-core-0.12.1.jar
 - lib/wunderboss-jars/jboss-logging-3.1.4.GA.jar
-- lib/resources/logback-cli.xml
+- lib/wunderboss-jars/wunderboss-core-0.12.1.jar
+- lib/wunderboss-jars/logback-core-1.1.3.jar
+- lib/wunderboss-jars/wunderboss-ruby-0.12.1.jar
+- lib/wunderboss-jars/logback-classic-1.1.3.jar
+- lib/wunderboss-jars/slf4j-api-1.7.7.jar
+- lib/torquebox/cli.rb
 - lib/torquebox/spec_helpers.rb
 - lib/torquebox/logger.rb
-- lib/torquebox/cli.rb
+- lib/torquebox/version.rb
 - lib/torquebox/codecs.rb
 - lib/torquebox/option_utils.rb
-- lib/torquebox/version.rb
+- lib/torquebox/daemon.rb
+- lib/torquebox/cli/archive_cleaner.rb
 - lib/torquebox/cli/jar.rb
 - lib/torquebox/cli/war.rb
-- lib/torquebox/cli/archive_cleaner.rb
 - lib/torquebox/cli/archive.rb
-- lib/torquebox/codecs/marshal_smart.rb
-- lib/torquebox/codecs/marshal.rb
-- lib/torquebox/codecs/json.rb
 - lib/torquebox/codecs/edn.rb
 - lib/torquebox/codecs/marshal_base64.rb
+- lib/torquebox/codecs/marshal_smart.rb
+- lib/torquebox/codecs/marshal.rb
 - lib/torquebox/codecs/text.rb
+- lib/torquebox/codecs/json.rb
+- lib/resources/logback-cli.xml
 homepage: http://torquebox.org/4x
 licenses:
 - Apache-2.0
@@ -119,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
-- jar org.projectodd.wunderboss:wunderboss-ruby, 0.8.0
-- jar org.projectodd.wunderboss:wunderboss-wildfly, 0.8.0
+- jar org.projectodd.wunderboss:wunderboss-ruby, 0.12.1
+- jar org.projectodd.wunderboss:wunderboss-wildfly-core, 0.12.1
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key: