rjack-jetty 6.1.24.0-java → 6.1.25.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 6.1.25.0 (2010-8-31)
+* Update to Jetty 6.1.25
+* Expand logback gem dev dependency for compatibility with logback-1.x
+* Require java for imports
+
 === 6.1.24.0 (2010-5-15)
 * Update to Jetty 6.1.24
 

data/Manifest.txt

@@ -14,8 +14,8 @@ test/test_jetty.rb
 webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty/jetty-6.1.24.jar
-lib/rjack-jetty/jetty-rewrite-handler-6.1.24.jar
-lib/rjack-jetty/jetty-util-6.1.24.jar
+lib/rjack-jetty/jetty-6.1.25.jar
+lib/rjack-jetty/jetty-rewrite-handler-6.1.25.jar
+lib/rjack-jetty/jetty-util-6.1.25.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar
 lib/rjack-jetty/servlet-api-2.5-20081211.jar

data/Rakefile

@@ -13,7 +13,7 @@ t = TarPit.new( 'rjack-jetty', Jetty::VERSION, :java_platform )
 
 t.specify do |h|
   h.developer( "David Kellum", "dek-oss@gravitext.com" )
-  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 = 'jetty'
 end

data/bin/rjack-jetty-service

@@ -23,8 +23,8 @@ require 'rubygems'
 begin
   gem     'rjack-logback'
   require 'rjack-logback'
-  Logback.config_console( :level => Logback::INFO )
-  log = SLF4J[ 'jetty-service' ]
+  RJack::Logback.config_console( :level => RJack::Logback::INFO )
+  log = RJack::SLF4J[ 'jetty-service' ]
 rescue Gem::LoadError => e
   class Log
     def method_missing( method, *args )

data/lib/rjack-jetty.rb

@@ -16,6 +16,8 @@
 
 require 'rjack-jetty/base'
 
+require 'java'
+
 module RJack
 
   # {Jetty Web Server}[http://www.mortbay.org/jetty/] module including
@@ -36,6 +38,7 @@ module RJack
     import 'org.mortbay.jetty.Handler'
     import 'org.mortbay.jetty.NCSARequestLog'
     import 'org.mortbay.jetty.Server'
+    import 'org.mortbay.jetty.handler.AbstractHandler'
     import 'org.mortbay.jetty.handler.ContextHandler'
     import 'org.mortbay.jetty.handler.ContextHandlerCollection'
     import 'org.mortbay.jetty.handler.DefaultHandler'

data/lib/rjack-jetty/base.rb

@@ -16,7 +16,7 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '6.1.24'
+    JETTY_VERSION = '6.1.25'
     VERSION = JETTY_VERSION + '.0'
     SERVLET_API_VERSION = '2.5'
     SERVLET_API_DATE = '20081211'

data/pom.xml

@@ -12,19 +12,19 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.24</version>
+      <version>6.1.25</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>6.1.24</version>
+      <version>6.1.25</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-rewrite-handler</artifactId>
-      <version>6.1.24</version>
+      <version>6.1.25</version>
     </dependency>
 
   </dependencies>

data/test/test_jetty.rb

@@ -35,12 +35,11 @@ require 'rjack-jetty/test-servlets'
 require 'test/unit'
 require 'net/http'
 
-include RJack
-
 class TestJetty < Test::Unit::TestCase
+  include RJack::Jetty
 
   def default_factory
-    factory = Jetty::ServerFactory.new
+    factory = ServerFactory.new
     factory.max_threads = 1
     factory.stop_at_shutdown = false
     factory
@@ -70,7 +69,6 @@ class TestJetty < Test::Unit::TestCase
     server.stop
   end
 
-  import 'org.mortbay.jetty.handler.AbstractHandler'
   class TestHandler < AbstractHandler
     TEST_TEXT = 'test handler text'
 
@@ -115,7 +113,7 @@ class TestJetty < Test::Unit::TestCase
 
     factory.set_context_servlets( '/',
       { '/one' => TestServlet.new( 'resp-one' ),
-        '/snoop' => Jetty::TestServlets::SnoopServlet.new } )
+        '/snoop' => TestServlets::SnoopServlet.new } )
 
     server = factory.create
     server.start
@@ -140,10 +138,10 @@ class TestJetty < Test::Unit::TestCase
   def test_webapp
     factory = default_factory
     index_html = File.read(
-      File.join( Jetty::TestServlets::WEBAPP_TEST_EXPANDED, 'index.html' ) )
+      File.join( TestServlets::WEBAPP_TEST_EXPANDED, 'index.html' ) )
 
-    factory.webapp_contexts[ '/test' ]     = Jetty::TestServlets::WEBAPP_TEST_WAR
-    factory.webapp_contexts[ '/expanded' ] = Jetty::TestServlets::WEBAPP_TEST_EXPANDED
+    factory.webapp_contexts[ '/test' ]     = TestServlets::WEBAPP_TEST_WAR
+    factory.webapp_contexts[ '/expanded' ] = TestServlets::WEBAPP_TEST_EXPANDED
 
     server = factory.create
     server.start

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
     - 6
     - 1
-    - 24
+    - 25
     - 0
-  version: 6.1.24.0
+  version: 6.1.25.0
 platform: java
 authors: 
   - David Kellum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -28,8 +28,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: *id001
   - !ruby/object:Gem::Dependency 
@@ -67,8 +73,8 @@ extensions: []
 
 extra_rdoc_files: 
   - Manifest.txt
-  - README.rdoc
   - History.rdoc
+  - README.rdoc
 files: 
   - History.rdoc
   - Manifest.txt
@@ -86,9 +92,9 @@ files:
   - webapps/test/index.html
   - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty/jetty-6.1.24.jar
-  - lib/rjack-jetty/jetty-rewrite-handler-6.1.24.jar
-  - lib/rjack-jetty/jetty-util-6.1.24.jar
+  - lib/rjack-jetty/jetty-6.1.25.jar
+  - lib/rjack-jetty/jetty-rewrite-handler-6.1.25.jar
+  - lib/rjack-jetty/jetty-util-6.1.25.jar
   - lib/rjack-jetty/rjack-jetty-1.0.jar
   - lib/rjack-jetty/servlet-api-2.5-20081211.jar
 has_rdoc: true