rjack-slf4j 1.5.11.1-java → 1.6.1.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 1.6.1.0 (2010-8-31)
+* Upgraded to SLF4J 1.6.1
+* Remove SLF4J from global namespace (was kept deprecated for
+  compatibility with move to RJack:: in 1.5.8.1)
+
 === 1.5.11.1 (2010-4-21)
 * Fix test case, call super in subclass of java
 

data/Manifest.txt

@@ -18,12 +18,12 @@ lib/rjack-slf4j/log4j-over-slf4j.rb
 lib/rjack-slf4j/log4j12.rb
 lib/rjack-slf4j/nop.rb
 lib/rjack-slf4j/simple.rb
-lib/rjack-slf4j/jcl-over-slf4j-1.5.11.jar
-lib/rjack-slf4j/jul-to-slf4j-1.5.11.jar
-lib/rjack-slf4j/log4j-over-slf4j-1.5.11.jar
-lib/rjack-slf4j/slf4j-api-1.5.11.jar
-lib/rjack-slf4j/slf4j-jcl-1.5.11.jar
-lib/rjack-slf4j/slf4j-jdk14-1.5.11.jar
-lib/rjack-slf4j/slf4j-log4j12-1.5.11.jar
-lib/rjack-slf4j/slf4j-nop-1.5.11.jar
-lib/rjack-slf4j/slf4j-simple-1.5.11.jar
+lib/rjack-slf4j/jcl-over-slf4j-1.6.1.jar
+lib/rjack-slf4j/jul-to-slf4j-1.6.1.jar
+lib/rjack-slf4j/log4j-over-slf4j-1.6.1.jar
+lib/rjack-slf4j/slf4j-api-1.6.1.jar
+lib/rjack-slf4j/slf4j-jcl-1.6.1.jar
+lib/rjack-slf4j/slf4j-jdk14-1.6.1.jar
+lib/rjack-slf4j/slf4j-log4j12-1.6.1.jar
+lib/rjack-slf4j/slf4j-nop-1.6.1.jar
+lib/rjack-slf4j/slf4j-simple-1.6.1.jar

data/Rakefile

@@ -1,27 +1,4 @@
 # -*- ruby -*-
-#--
-# Copyright (C) 2008-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.
-#++
 
 $LOAD_PATH << './lib'
 require 'rjack-slf4j/base'

data/lib/rjack-slf4j.rb

@@ -25,9 +25,6 @@
 require 'rjack-slf4j/base'
 require 'java'
 
-# Backward compatibility for top level ::SLF4J module
-SLF4J = RJack::SLF4J
-
 module RJack
 
   # Wrapper and core Logger compatible adapter for the

data/lib/rjack-slf4j/base.rb

@@ -26,9 +26,9 @@ module RJack
   module SLF4J
 
     # SLF4J-java version
-    SLF4J_VERSION = '1.5.11'
+    SLF4J_VERSION = '1.6.1'
     # SLF4J gem version
-    VERSION = SLF4J_VERSION + '.1'
+    VERSION = SLF4J_VERSION + '.0'
 
     SLF4J_DIR = File.dirname(__FILE__) # :nodoc:
 

data/pom.xml

@@ -12,34 +12,34 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jcl</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-nop</artifactId>
-      <version>1.5.11</version>
+      <version>1.6.1</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>

data/test/example_jul_to_slf4j.rb

@@ -30,6 +30,8 @@ require 'rjack-slf4j/jul-to-slf4j'
 # FIXME: Can't make this a standard test case, as test_slf4j.rb uses
 # slf4j/jdk14 output adapter.
 
+include RJack
+
 SLF4J::JUL.replace_root_handlers
 SLF4J::JUL.root.level = SLF4J::JUL::INFO
 

data/test/test_slf4j.rb

@@ -69,7 +69,7 @@ module Foo
 end
 
 class TestSlf4j < Test::Unit::TestCase
-
+  include RJack
   JdkLogger = java.util.logging.Logger
 
   def setup

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 1
-    - 5
-    - 11
+    - 6
     - 1
-  version: 1.5.11.1
+    - 0
+  version: 1.6.1.0
 platform: java
 authors: 
   - David Kellum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
             segments: 
               - 1
               - 2
-              - 1
-            version: 1.2.1
+              - 2
+            version: 1.2.2
     type: :development
     version_requirements: *id001
 description: |-
@@ -52,8 +52,8 @@ extensions: []
 
 extra_rdoc_files: 
   - Manifest.txt
-  - README.rdoc
   - History.rdoc
+  - README.rdoc
 files: 
   - History.rdoc
   - Manifest.txt
@@ -75,15 +75,15 @@ files:
   - lib/rjack-slf4j/log4j12.rb
   - lib/rjack-slf4j/nop.rb
   - lib/rjack-slf4j/simple.rb
-  - lib/rjack-slf4j/jcl-over-slf4j-1.5.11.jar
-  - lib/rjack-slf4j/jul-to-slf4j-1.5.11.jar
-  - lib/rjack-slf4j/log4j-over-slf4j-1.5.11.jar
-  - lib/rjack-slf4j/slf4j-api-1.5.11.jar
-  - lib/rjack-slf4j/slf4j-jcl-1.5.11.jar
-  - lib/rjack-slf4j/slf4j-jdk14-1.5.11.jar
-  - lib/rjack-slf4j/slf4j-log4j12-1.5.11.jar
-  - lib/rjack-slf4j/slf4j-nop-1.5.11.jar
-  - lib/rjack-slf4j/slf4j-simple-1.5.11.jar
+  - lib/rjack-slf4j/jcl-over-slf4j-1.6.1.jar
+  - lib/rjack-slf4j/jul-to-slf4j-1.6.1.jar
+  - lib/rjack-slf4j/log4j-over-slf4j-1.6.1.jar
+  - lib/rjack-slf4j/slf4j-api-1.6.1.jar
+  - lib/rjack-slf4j/slf4j-jcl-1.6.1.jar
+  - lib/rjack-slf4j/slf4j-jdk14-1.6.1.jar
+  - lib/rjack-slf4j/slf4j-log4j12-1.6.1.jar
+  - lib/rjack-slf4j/slf4j-nop-1.6.1.jar
+  - lib/rjack-slf4j/slf4j-simple-1.6.1.jar
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
 licenses: []