rjack-jets3t 0.7.2.0-java → 0.7.4.0-java

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 0.7.4.0 (2010-8-31)
+* Updated to jets3t 0.7.4 (Note
+  {Issue #16}[http://bitbucket.org/jmurty/jets3t/issue/16/classnotfoundexception])
+* Remove require 'rubygems' from lib, require 'java' for imports.
+* Expand slf4j/logback gem deps for compatibility with
+  slf4j-1.6.x/logback-1.x
+
 === 0.7.2.0 (2010-5-13)
 * Updated to jets3t 0.7.2
 * New S3Bucket wrapper with put/delete methods.

data/Manifest.txt

@@ -10,4 +10,5 @@ lib/rjack-jets3t.rb
 lib/rjack-jets3t/s3_bucket.rb
 lib/rjack-jets3t/s3_service.rb
 test/test_jets3t.rb
-lib/rjack-jets3t/jets3t-0.7.2.jar
+lib/rjack-jets3t/java-xmlbuilder-0.3.jar
+lib/rjack-jets3t/jets3t-0.7.4.jar

data/Rakefile

@@ -9,20 +9,20 @@ require 'rjack-tarpit'
 
 include RJack
 
-t = TarPit.new( 'rjack-jets3t', JetS3t::VERSION, :java_platform )
+t = TarPit.new( 'rjack-jets3t', JetS3t::VERSION,
+                :java_platform, :jars_from_assembly )
 
 t.specify do |h|
   h.developer( "David Kellum", "dek-oss@gravitext.com" )
-  h.extra_deps     += [ [ 'rjack-slf4j',         '~> 1.5.8' ],
+  h.extra_deps     += [ [ 'rjack-slf4j',         '>= 1.5.8', '< 1.7' ],
                         [ 'rjack-httpclient-3',  '~> 3.1.3' ],
                         [ 'rjack-commons-codec', '~> 1.4.0' ] ]
-  h.extra_dev_deps <<   [ 'rjack-logback',       '>= 0.9.17']
+  h.extra_dev_deps <<   [ 'rjack-logback',       '>= 0.9.18', '< 2.0' ]
   h.rubyforge_name  = "rjack"
   h.remote_rdoc_dir = "jets3t"
 end
 
 t.assembly_version = 1.0
-t.jars = [ "jets3t-#{ JetS3t::JETS3T_VERSION }.jar" ]
 file 'Manifest.txt' => [ "lib/#{t.name}/base.rb" ]
 
 task :check_pom_deps do

data/assembly.xml

@@ -8,6 +8,7 @@
     <dependencySet>
       <includes>
         <include>net.java.dev.jets3t:jets3t</include>
+        <include>com.jamesmurty.utils:java-xmlbuilder</include>
       </includes>
     </dependencySet>
   </dependencySets>

data/lib/rjack-jets3t.rb

@@ -22,7 +22,7 @@ require 'rjack-jets3t/base'
 
 module RJack
   module JetS3t
-    require "#{JETS3T_DIR}/jets3t-#{JETS3T_VERSION}.jar"
+    Dir.glob( File.join( JETS3T_DIR, '*.jar' ) ).each { |jar| require jar }
   end
 end
 

data/lib/rjack-jets3t/base.rb

@@ -17,7 +17,7 @@
 module RJack
   module JetS3t
     # JetS3t java version
-    JETS3T_VERSION = '0.7.2'
+    JETS3T_VERSION = '0.7.4'
 
     # rjack-jets3t version
     VERSION = JETS3T_VERSION + '.0'

data/lib/rjack-jets3t/s3_bucket.rb

@@ -20,6 +20,8 @@ require 'rjack-commons-codec'
 require 'rjack-httpclient-3'
 require 'rjack-jets3t/base'
 
+require 'java'
+
 module RJack
   module JetS3t
     import 'org.jets3t.service.acl.AccessControlList'

data/lib/rjack-jets3t/s3_service.rb

@@ -22,6 +22,8 @@ require 'rjack-jets3t/base'
 
 require 'rjack-jets3t/s3_bucket'
 
+require 'java'
+
 module RJack
   module JetS3t
     import 'org.jets3t.service.S3ServiceException'

data/pom.xml

@@ -18,20 +18,19 @@
       <id>jets3t</id>
       <url>http://jets3t.s3.amazonaws.com/maven2</url>
     </repository>
+    <repository>
+      <name>xmlbuilder</name>
+      <id>xmlbuilder</id>
+      <url>http://java-xmlbuilder.googlecode.com/svn/repo/</url>
+    </repository>
   </repositories>
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.8</version>
-    </dependency>
-
     <dependency>
       <groupId>net.java.dev.jets3t</groupId>
       <artifactId>jets3t</artifactId>
-      <version>0.7.2</version>
+      <version>0.7.4</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -39,7 +38,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
   </dependencies>
 
   <build>

data/test/test_jets3t.rb

@@ -19,21 +19,16 @@
 $LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
 
 require 'rubygems'
-gem( 'rjack-slf4j',   '~> 1.5.8' )
-gem( 'rjack-logback', '~> 0.9.17' )
-
 require 'rjack-logback'
 
-include RJack
-
-Logback.config_console( :level => Logback::INFO )
+RJack::Logback.config_console( :level => RJack::Logback::INFO )
 
 require 'rjack-jets3t'
 
 require 'test/unit'
 
 class TestJets3t < Test::Unit::TestCase
-  include JetS3t
+  include RJack::JetS3t
 
   import "java.io.ByteArrayInputStream"
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 7
-    - 2
+    - 4
     - 0
-  version: 0.7.2.0
+  version: 0.7.4.0
 platform: java
 authors: 
   - David Kellum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -23,13 +23,19 @@ dependencies:
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
             segments: 
               - 1
               - 5
               - 8
             version: 1.5.8
+        - - <
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 7
+            version: "1.7"
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -70,8 +76,14 @@ dependencies:
             segments: 
               - 0
               - 9
-              - 17
-            version: 0.9.17
+              - 18
+            version: 0.9.18
+        - - <
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+            version: "2.0"
     type: :development
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
@@ -84,8 +96,8 @@ dependencies:
             segments: 
               - 1
               - 2
-              - 1
-            version: 1.2.1
+              - 2
+            version: 1.2.2
     type: :development
     version_requirements: *id005
 description: |-
@@ -101,8 +113,8 @@ extensions: []
 extra_rdoc_files: 
   - Manifest.txt
   - NOTICE.txt
-  - README.rdoc
   - History.rdoc
+  - README.rdoc
 files: 
   - History.rdoc
   - Manifest.txt
@@ -116,7 +128,8 @@ files:
   - lib/rjack-jets3t/s3_bucket.rb
   - lib/rjack-jets3t/s3_service.rb
   - test/test_jets3t.rb
-  - lib/rjack-jets3t/jets3t-0.7.2.jar
+  - lib/rjack-jets3t/java-xmlbuilder-0.3.jar
+  - lib/rjack-jets3t/jets3t-0.7.4.jar
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
 licenses: []