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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a214188915ae4edc4146fdbaccc7f2486e90299c
-  data.tar.gz: 44b8ca8c0f8c71b082286e30ee4410fb0f785eae
+  metadata.gz: 064ab706a2d83b43252af08da71d29b9770a95cc
+  data.tar.gz: e63a2845b426855b3ba7fef611558bb759a5273d
 SHA512:
-  metadata.gz: ffa0c2cfd42df46a709a8f5dbeb69c76198351845d7d1a997cb04983210b6195478a674e7308225a670e3bf967e2f59e3bbe2860e70c45d66fb3d997130db5b9
-  data.tar.gz: 281bf2ff66a003b39b59ac608f8401dae5748562e56dd79ecb7c0b1ffe9a87b87a915ce649d61deecd96264dee2bb30599d284ced1cf294179db86752530d64f
+  metadata.gz: eac2bfbda2e5404d0a2bb9fef0ec46b7ad760d9c8a1e79e19765b9a4728ebb0d728842835695a0c3165cc72bfde85e19eaaf3a55890767a632697dcfadaa0d3c
+  data.tar.gz: f8c2cdf6d27a2250742a5d272dc3a389caebe0fc4760703aedd6a6c3a74f6fb8f0706f151cb9f3c9393465892db787f4a61c7450514caa70a21dce4d890d1556

data/lib/torquebox/cli/jar.rb

@@ -173,7 +173,7 @@ module TorqueBox
         end
         add_files(jar_builder,
                   :file_prefix => Dir.pwd,
-                  :pattern => "/**/*",
+                  :pattern => "/**/{*,\.*manifest*}",
                   :jar_prefix => "app",
                   :exclude => exclude)
       end

data/lib/torquebox/logger.rb

@@ -12,16 +12,183 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'logger'
+require 'stringio'
 
 module TorqueBox
   class Logger
+
+    java_import org.projectodd.wunderboss::WunderBoss
+    java_import org.projectodd.wunderboss::LogbackUtil
+    java_import Java::ch.qos.logback.classic.joran.JoranConfigurator
+    java_import Java::ch.qos.logback.core.joran.spi::JoranException
+
+    DEFAULT_CATEGORY = 'TorqueBox'.freeze
+
+    STD_LOGGER_LEVELS = {
+      ::Logger::DEBUG => 'DEBUG',
+      ::Logger::INFO  => 'INFO',
+      ::Logger::WARN  => 'WARN',
+      ::Logger::ERROR => 'ERROR',
+      ::Logger::FATAL => 'FATAL'
+    }
+
     class << self
       attr_reader :log_level
 
       def log_level=(level)
         @log_level = level
-        org.projectodd.wunderboss.WunderBoss.log_level = level
+        WunderBoss.log_level = level
+      end
+
+      def context
+        @context ||= org.slf4j.LoggerFactory.getILoggerFactory
       end
+
+      def configure_with_xml(xml)
+        context.reset
+        configurator = JoranConfigurator.new
+        configurator.context = context
+        configurator.do_configure(xml)
+      rescue JoranException
+        configurator.do_configure(StringIO.new(xml).to_inputstream)
+      end
+    end
+
+    attr_accessor :formatter
+
+    # Wraps a WunderBoss logger
+    #
+    # @param name [Object] Name for the logger
+    def initialize(name = DEFAULT_CATEGORY)
+      @logger = WunderBoss.logger(name.to_s.gsub('::', '.'))
+    end
+
+    # Reports if TRACE level is enabled
+    #
+    # @return [true, false] true if TRACE is enabled
+    def trace?
+      @logger.trace_enabled?
+    end
+
+    # Reports if DEBUG level is enabled
+    #
+    # @return [true, false] true if DEBUG is enabled
+    def debug?
+      @logger.debug_enabled?
+    end
+
+    # Reports if INFO level is enabled
+    #
+    # @return [true, false] true if INFO is enabled
+    def info?
+      @logger.info_enabled?
+    end
+
+    # Reports if WARN level is enabled
+    #
+    # @return [true, false] true if WARN is enabled
+    def warn?
+      @logger.warn_enabled?
+    end
+
+    # Reports if ERROR level is enabled
+    #
+    # @return [true, false] true if ERROR is enabled
+    def error?
+      @logger.error_enabled?
+    end
+
+    # @!method fatal?()
+    #
+    # Reports if FATAL level is enabled
+    #
+    # @return [true, false] true if FATAL is enabled
+    alias_method :fatal?, :error?
+
+    # Logs a message at the TRACE level
+    #
+    # @param message [String] the message to log
+    # @return [void]
+    def trace(*params, &block)
+      add(:trace, *params, &block)
+    end
+
+    # Logs a message at the DEBUG level
+    #
+    # @param message [String] the message to log
+    # @return [void]
+    def debug(*params, &block)
+      add(:debug, *params, &block)
+    end
+
+    # Logs a message at the INFO level
+    #
+    # @param message [String] the message to log
+    # @return [void]
+    def info(*params, &block)
+      add(:info, *params, &block)
+    end
+
+    # Logs a message at the WARN level
+    #
+    # @param message [String] the message to log
+    # @return [void]
+    def warn(*params, &block)
+      add(:warn, *params, &block)
+    end
+
+    # Logs a message at the ERROR level
+    #
+    # @param message [String] the message to log
+    # @return [void]
+    def error(*params, &block)
+      add(:error, *params, &block)
+    end
+
+    # @!method fatal?()
+    #
+    # Logs a message at the FATAL level
+    #
+    # @param message [String] the message to log
+    # @return [void]
+    alias_method :fatal, :error
+
+    # Reports current logger's level
+    #
+    # @return [String] log level
+    def level
+      (@logger.level || @logger.effective_level).to_s
+    end
+
+    # Sets current logger's level
+    #
+    # @params [String] log level
+    # @returns [String] log level
+    def level=(new_level)
+      if new_level.respond_to?(:to_int)
+        new_level = STD_LOGGER_LEVELS[new_level]
+      end
+
+      LogbackUtil.set_log_level(@logger, new_level)
+    end
+
+    # Allow our logger to be used for env['rack.errors']
+    def puts(message)
+      info message.to_s
+    end
+
+    def write(message)
+      info message.strip
+    end
+
+    def flush; end
+
+    private
+
+    def add(severity, *params)
+      message = block_given? ? yield : params.shift
+      @logger.send(severity, message, *params)
     end
   end
 end

data/lib/torquebox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -74,32 +74,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/torquebox
-- lib/torquebox-core.jar
 - lib/torquebox-core.rb
-- lib/torquebox/version.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/wunderboss-jars/jboss-logging-3.1.4.GA.jar
+- lib/resources/logback-cli.xml
 - lib/torquebox/spec_helpers.rb
-- lib/torquebox/codecs.rb
-- lib/torquebox/option_utils.rb
 - lib/torquebox/logger.rb
 - lib/torquebox/cli.rb
+- lib/torquebox/codecs.rb
+- lib/torquebox/option_utils.rb
+- lib/torquebox/version.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/edn.rb
 - lib/torquebox/codecs/json.rb
+- lib/torquebox/codecs/edn.rb
 - lib/torquebox/codecs/marshal_base64.rb
 - lib/torquebox/codecs/text.rb
-- lib/torquebox/cli/archive_cleaner.rb
-- lib/torquebox/cli/war.rb
-- lib/torquebox/cli/jar.rb
-- lib/torquebox/cli/archive.rb
-- lib/wunderboss-jars/wunderboss-ruby-0.8.0.jar
-- lib/wunderboss-jars/logback-classic-1.1.2.jar
-- lib/wunderboss-jars/logback-core-1.1.2.jar
-- lib/wunderboss-jars/wunderboss-core-0.8.0.jar
-- lib/wunderboss-jars/jboss-logging-3.1.4.GA.jar
-- lib/wunderboss-jars/slf4j-api-1.7.5.jar
-- lib/wunderboss-jars/wunderboss-wildfly-0.8.0.jar
-- lib/resources/logback-cli.xml
 homepage: http://torquebox.org/4x
 licenses:
 - Apache-2.0