slf4j 1.5.6.2 → 1.5.6.3

data/History.txt

@@ -1,17 +1,21 @@
-=== 1.5.6.2 / 2009-04-04
-
+=== 1.5.6.3 (2009-4-25)
+* Added SLF4J::JUL for controlling java.util.logging, including
+  JUL.replace_root_handlers which removes all existing handlers and
+  add SLF4JBridgeHandler for exclusive routing to SLF4J for use with
+  'jul-to-slf4j'.
+* Added require 'slf4j' to each adapter loader.
+* Use rdoc 2.4.3 and hoe 1.12.2 for build.
+
+=== 1.5.6.2 (2009-4-4)
 * Fixed previously lost rdoc due to base vs slf4j.rb manifest order.
 
-=== 1.5.6.1 / 2008-12-06
-
+=== 1.5.6.1 (2008-12-6)
 * Upgraded to SLF4J 1.5.6
 * SLF4JBase -rename-> SLF4J
 
-=== 1.5.5.1 / 2008-11-01
-
+=== 1.5.5.1 (2008-11-1)
 * Upgraded to SLF4J 1.5.5
 
-=== 1.5.3.1 / 2008-10-08
-
+=== 1.5.3.1 (2008-10-8)
 * Initial release based on SLF4J 1.5.3
 

data/Manifest.txt

@@ -6,8 +6,9 @@ pom.xml
 assembly.xml
 lib/slf4j/base.rb
 lib/slf4j.rb
-test/test_slf4j.rb
 lib/slf4j/jul-to-slf4j.rb
+lib/slf4j/jul.rb
+test/test_slf4j.rb
 lib/slf4j/jdk14.rb
 lib/slf4j/jcl-over-slf4j.rb
 lib/slf4j/jcl.rb

data/Rakefile

@@ -34,6 +34,7 @@ ENV['NODOT'] = "no thank you"
 require 'slf4j/base' 
 
 loaders = SLF4J::ADAPTERS.flatten.compact
+loaders.delete( "jul-to-slf4j" ) # exception: maintained as source
 loader_files = loaders.map { |adp| "lib/slf4j/#{adp}.rb" }
 
 jars = [ 'slf4j-api' ]
@@ -55,6 +56,8 @@ pom.xml
 assembly.xml
 lib/slf4j/base.rb
 lib/slf4j.rb
+lib/slf4j/jul-to-slf4j.rb
+lib/slf4j/jul.rb
 test/test_slf4j.rb
 END
     out.puts loader_files
@@ -68,6 +71,7 @@ loaders.each do |adapter|
   file "lib/slf4j/#{adapter}.rb" do
     out = File.new( "lib/slf4j/#{adapter}.rb", 'w' )
     begin
+      out.puts "require 'slf4j'"
       out.puts "SLF4J.require_adapter( '#{adapter}' )"
     ensure
       out.close
@@ -108,9 +112,7 @@ task :tag do
   sh %{git tag -s -f -m "tag [#{tag}]" "#{tag}"}
 end
 
-
 hoe = Hoe.new( "slf4j", SLF4J::VERSION ) do |p|
   p.developer( "David Kellum", "dek-ruby@gravitext.com" )
   p.rubyforge_name = "rjack"
-  p.rdoc_pattern = /^(lib.*\.(rb|txt))|[^\/]*\.txt$/
 end

data/lib/slf4j.rb

@@ -37,26 +37,34 @@ require 'java'
 #
 # == Adapters
 #
-# All of the following output adapters are available via +require+:
+# An output adapter must be required before the first log call.  All
+# of the following output adapters are available via +require+ from
+# the slf4j gem:
 #
 #   require 'slf4j/jcl'       # Output to Jakarta Commons Logging
-#   require 'slf4j/jdk14'     # JDK java.util.logging 
+#   require 'slf4j/jdk14'     # JDK java.util.logging (JUL)
 #   require 'slf4j/log4j12'   # Log4j (provided elsewhere)
 #   require 'slf4j/nop'       # NOP null logger (provided)
 #   require 'slf4j/simple'    # Simple logger (provided)
 #
-# The first loaded output adapter wins (as with mulitple adapters on
+# The Logback[http://rjack.rubyforge.org/logback/index.html] gem may
+# also be be used as the output adapter:
+#
+#   require 'logback'
+#
+# The first loaded output adapter wins (as with multiple adapters on
 # the classpath). A warning will be logged to "slf4j" if an attempt is
 # made to require a second output adapter.
 #
-# And the following input adapters will intercept JCL,
-# java.util.logging (jdk14), or log4j log output and direct it through
-# SLF4J:
+# The following input adapters will intercept JCL, java.util.logging
+# (JUL), or log4j log output and direct it through SLF4J:
 #
 #   require 'slf4j/jcl-over-slf4j'   # Route Jakarta Commons Logging to SLF4J
-#   require 'slf4j/jul-to-slf4j'     # JDK java.util.logging to SLF4J
 #   require 'slf4j/log4j-over-slf4j' # Log4j to SLF4J
 #
+#   require 'slf4j/jul-to-slf4j'     # JDK java.util.logging (JUL) to SLF4J
+#   SLF4J::JUL.replace_root_handlers # Special case setup for JUL
+#
 # Multiple input adapters may be require'd.  However, a RuntimeError
 # will be raised in the attempt to require both an output adapter and
 # input adapter from/to the same interface, for example
@@ -101,11 +109,6 @@ module SLF4J
       require_jar( name )
     end
 
-    # Special case, requires explicit 'install'
-    if name == 'jul-to-slf4j' 
-      org.slf4j.bridge.SLF4JBridgeHandler.install
-    end
-
     @@loaded[ name ] = true
   end
 

data/lib/slf4j/base.rb

@@ -28,7 +28,7 @@ module SLF4J
   # SLF4J-java version
   SLF4J_VERSION = '1.5.6'
   # SLF4J gem version
-  VERSION = SLF4J_VERSION + '.2'
+  VERSION = SLF4J_VERSION + '.3'
 
   SLF4J_DIR = File.dirname(__FILE__) # :nodoc:
 

data/lib/slf4j/jcl-over-slf4j.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'jcl-over-slf4j' )

data/lib/slf4j/jcl.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'jcl' )

data/lib/slf4j/jdk14.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'jdk14' )

data/lib/slf4j/jul-to-slf4j.rb

@@ -1 +1,21 @@
+require 'slf4j'
+require 'slf4j/jul'
+
 SLF4J.require_adapter( 'jul-to-slf4j' )
+
+module SLF4J::JUL
+
+  # Replace any existing configured root java.util.Logger Handlers with
+  # the org.slf4j.bridge.SLF4JBridgeHandler
+  def self.replace_root_handlers
+    root_logger = root
+    root_logger.handlers.each do |handler|
+      root_logger.remove_handler( handler )
+    end
+    handler = Java::org.slf4j.bridge.SLF4JBridgeHandler.new
+
+    root_logger.add_handler( handler )
+  end
+
+end
+

data/lib/slf4j/jul.rb

@@ -0,0 +1,76 @@
+#--
+# Copyright (C) 2009 David Kellum
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.  
+#++
+
+require 'java'
+
+# Utilities for finer grain control of the JDK java.util.logging
+# (JUL). In particular, unlike other logging API's reimplemented by
+# slf4j adapters, JUL log levels remain significant for enabling output
+# or avoiding log message generation cycles. For a particular
+# level to be output, both JUL and the destination SLF4J output adapter
+# must enable it.
+#
+# == Usage
+#
+# Adjust JUL levels (in conjunction with 'slf4j/jul-to-slf4j' or
+# 'slf4j/jdk14', see SLF4J.)
+#
+#   require 'slf4j/jul'
+#   SLF4J::JUL[ "my.jul.logger" ].level = SLF4J::JUL::FINER
+#
+# Direct all output to SLF4J (output adapter != 'jdk14')
+#
+#   require 'slf4j/jul-to-slf4j'
+#   SLF4J::JUL.replace_root_handlers
+#
+module SLF4J::JUL
+  LogManager         = Java::java.util.logging.LogManager
+  Logger             = Java::java.util.logging.Logger
+  Level              = Java::java.util.logging.Level
+
+  SEVERE  = Level::SEVERE
+  WARNING = Level::WARNING
+  INFO    = Level::INFO
+  CONFIG  = Level::CONFIG
+  FINE    = Level::FINE
+  FINER   = Level::FINER
+  FINEST  = Level::FINEST
+  ALL     = Level::ALL
+  
+  # Global java.util.logging.LogManager reset: close any handlers and
+  # set root level to INFO.
+  def self.reset
+    LogManager.log_manager.reset
+  end
+
+  # Get java.util.logging.Logger by name (responds to level=, etc.)
+  def self.[]( name )
+    Logger.get_logger( name )
+  end
+
+  # Get the root logger (empty string name)
+  def self.root
+    Logger.get_logger( "" )
+  end
+end

data/lib/slf4j/log4j-over-slf4j.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'log4j-over-slf4j' )

data/lib/slf4j/log4j12.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'log4j12' )

data/lib/slf4j/nop.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'nop' )

data/lib/slf4j/simple.rb

@@ -1 +1,2 @@
+require 'slf4j'
 SLF4J.require_adapter( 'simple' )

metadata

@@ -43,8 +43,9 @@ files:
 - assembly.xml
 - lib/slf4j/base.rb
 - lib/slf4j.rb
-- test/test_slf4j.rb
 - lib/slf4j/jul-to-slf4j.rb
+- lib/slf4j/jul.rb
+- test/test_slf4j.rb
 - lib/slf4j/jdk14.rb
 - lib/slf4j/jcl-over-slf4j.rb
 - lib/slf4j/jcl.rb
@@ -74,12 +75,12 @@ requirements: []
 
 authors: 
 - David Kellum
-date: 2009-04-04 08:00:00 +00:00
+date: 2009-04-26 08:00:00 +00:00
 platform: ruby
 test_files: 
 - test/test_slf4j.rb
 version: !ruby/object:Gem::Version 
-  version: 1.5.6.2
+  version: 1.5.6.3
 require_paths: 
 - lib
 dependencies: 
@@ -88,7 +89,7 @@ dependencies:
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.12.2
     version: 
   type: :development
   version_requirement: