rjack-jetty 7.2.2.0-java → 7.4.1.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 7.4.1.0 (2011-5-15)
+* Update to Jetty 7.4.1.v20110513
+* Increase thread pool min_threads to 2 (fixes test hang with 7.3+)
+* Support creating NCSARequestLog to :stderr
+
 === 7.2.2.0 (2010-12-28)
 
 * Update to Jetty 7.2.2. This is major upgrade with broad java package

data/Manifest.txt

@@ -14,15 +14,15 @@ test/test_jetty.rb
 webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty/jetty-continuation-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-http-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-io-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-rewrite-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-security-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-server-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-servlet-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-util-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-webapp-7.2.2.v20101205.jar
-lib/rjack-jetty/jetty-xml-7.2.2.v20101205.jar
+lib/rjack-jetty/jetty-continuation-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-http-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-io-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-rewrite-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-security-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-server-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-servlet-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-util-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-webapp-7.4.1.v20110513.jar
+lib/rjack-jetty/jetty-xml-7.4.1.v20110513.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar
 lib/rjack-jetty/servlet-api-2.5.jar

data/README.rdoc

@@ -59,7 +59,7 @@ No hard requirements, however:
 
 === rjack-jetty gem
 
-Copyright (c) 2008-2010 David Kellum
+Copyright (c) 2008-2011 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -4,7 +4,7 @@ $LOAD_PATH << './lib'
 require 'rjack-jetty/base'
 
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.2.0'
+gem     'rjack-tarpit', '~> 1.3.0'
 require 'rjack-tarpit'
 
 include RJack
@@ -14,8 +14,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.18', '< 2.0' ]
-  h.rubyforge_name  = 'rjack'
-  h.remote_rdoc_dir = 'jetty'
+  h.rdoc_locations << "dekellum@rubyforge.org:/var/www/gforge-projects/rjack/jetty"
 end
 
 t.jars =

data/bin/rjack-jetty-service

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2008-2010 David Kellum
+# Copyright (c) 2008-2011 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/rjack-jetty.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010 David Kellum
+# Copyright (c) 2008-2011 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -119,8 +119,10 @@ module RJack
                      :static_contexts, :static_welcome_files,
                      :webapp_contexts,
                      :servlet_contexts,
-                     :stop_at_shutdown,
-                     :request_log_file )
+                     :stop_at_shutdown )
+
+      # Request log output to :stderr or file name (default: nil, no log)
+      attr_accessor  :request_log_file
 
       def initialize
         @port                 = 0        # Use any available port
@@ -160,7 +162,7 @@ module RJack
       # (default 20).
       def create_pool
         pool = QueuedThreadPool.new
-        pool.min_threads = [ @min_threads || ( @max_threads / 4 ), 1 ].max
+        pool.min_threads = [ @min_threads || ( @max_threads / 4 ), 2 ].max
         pool.max_threads = [ @max_threads, 3 ].max
         pool
       end
@@ -268,7 +270,11 @@ module RJack
 
       # Create a NCSARequestLog to append to log_file
       def create_request_log( log_file )
-        log = NCSARequestLog.new( log_file )
+        log = if log_file == :stderr
+                NCSARequestLog.new
+              else
+                NCSARequestLog.new( log_file )
+              end
         log.log_time_zone = java.util.TimeZone::getDefault.getID
         log.append = true;
         log

data/lib/rjack-jetty/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010 David Kellum
+# Copyright (c) 2008-2011 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,9 +16,9 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '7.2.2'
+    JETTY_VERSION = '7.4.1'
     VERSION = JETTY_VERSION + '.0'
-    JETTY_BUILD = 'v20101205'
+    JETTY_BUILD = 'v20110513'
     SERVLET_API_VERSION = '2.5'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:

data/lib/rjack-jetty/test-servlets.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010 David Kellum
+# Copyright (c) 2008-2011 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/pom.xml

@@ -5,38 +5,42 @@
   <artifactId>rjack-jetty</artifactId>
   <packaging>jar</packaging>
   <version>1.0</version>
-  <name>Gravitext Test Servlets</name> -->
+  <name>Test Servlets</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <dependencies>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>7.2.2.v20101205</version>
+      <version>7.4.1.v20110513</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.2.2.v20101205</version>
+      <version>7.4.1.v20110513</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>7.2.2.v20101205</version>
+      <version>7.4.1.v20110513</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>7.2.2.v20101205</version>
+      <version>7.4.1.v20110513</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>7.2.2.v20101205</version>
+      <version>7.4.1.v20110513</version>
     </dependency>
 
   </dependencies>
@@ -45,24 +49,27 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
         <configuration>
+          <attach>false</attach>
+          <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
           <descriptors>
             <descriptor>assembly.xml</descriptor>
           </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
         <executions>
           <execution>
             <id>assembly</id>
             <phase>package</phase>
             <goals>
-              <goal>attached</goal>
+              <goal>single</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>

data/test/test_jetty.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 #.hashdot.profile += jruby-shortlived
 #--
-# Copyright (c) 2008-2010 David Kellum
+# Copyright (c) 2008-2011 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -54,6 +54,7 @@ class TestJetty < Test::Unit::TestCase
       assert( server.is_started )
       assert( server.connectors[0].local_port > 0 )
       server.stop
+      server.join
       assert( server.is_stopped )
     end
   end
@@ -64,9 +65,10 @@ class TestJetty < Test::Unit::TestCase
     server = factory.create
     server.start
     port = server.connectors[0].local_port
-    test_text = Net::HTTP.get( 'localhost', '/test.txt', port )
+    test_text = get( '/test.txt', port ).body
     assert_equal( File.read( File.join( TEST_DIR, 'test.txt' ) ), test_text )
     server.stop
+    server.join
   end
 
   class TestHandler < AbstractHandler
@@ -87,9 +89,10 @@ class TestJetty < Test::Unit::TestCase
     server = factory.create
     server.start
     port = server.connectors[0].local_port
-    assert_equal( TestHandler::TEST_TEXT,
-                  Net::HTTP.get( 'localhost', '/whatever', port ) )
+    resp = get( '/whatever', port )
+    assert_equal( TestHandler::TEST_TEXT, resp.body )
     server.stop
+    server.join
   end
 
   import 'javax.servlet.http.HttpServlet'
@@ -112,27 +115,23 @@ class TestJetty < Test::Unit::TestCase
         '/other' => TestServlet.new( 'resp-other' ) } )
 
     factory.set_context_servlets( '/',
-      { '/one' => TestServlet.new( 'resp-one' ),
+      { '/one'   => TestServlet.new( 'resp-one' ),
         '/snoop' => TestServlets::SnoopServlet.new } )
 
     server = factory.create
     server.start
     port = server.connectors[0].local_port
 
-    assert_equal( 'resp-test',
-                  Net::HTTP.get( 'localhost', '/some/test', port ) )
-    assert_equal( 'resp-other',
-                  Net::HTTP.get( 'localhost', '/some/other', port ) )
-    assert_equal( 'resp-one',
-                  Net::HTTP.get( 'localhost', '/one', port ) )
+    assert_equal( 'resp-test',  get( '/some/test', port ).body )
+    assert_equal( 'resp-other', get( '/some/other', port ).body )
+    assert_equal( 'resp-one',   get( '/one', port ).body )
 
-    response = Net::HTTP.get_response( 'localhost', '/', port )
-    assert( response.is_a?( Net::HTTPNotFound ) )
+    assert( get( '/', port ).is_a?( Net::HTTPNotFound ) )
 
-    response = Net::HTTP.get_response( 'localhost', '/snoop', port )
-    assert( response.is_a?( Net::HTTPSuccess ) )
+    assert( get( '/snoop', port ).is_a?( Net::HTTPSuccess ) )
 
     server.stop
+    server.join
   end
 
   def test_webapp
@@ -147,12 +146,21 @@ class TestJetty < Test::Unit::TestCase
     server.start
     port = server.connectors[0].local_port
 
-    assert_equal( index_html, Net::HTTP.get( 'localhost', '/test/', port ) )
-    assert_equal( index_html, Net::HTTP.get( 'localhost', '/expanded/', port ) )
+    assert_equal( index_html, get( '/test/', port ).body )
+    assert_equal( index_html, get( '/expanded/', port ).body )
 
-    response = Net::HTTP.get_response( 'localhost', '/test/snoop/info?i=33', port )
-    assert( response.is_a?( Net::HTTPSuccess ) )
+    assert( get( '/test/snoop/info?i=33', port ).is_a?( Net::HTTPSuccess ) )
 
     server.stop
+    server.join
   end
+
+  def get( path, port )
+    Net::HTTP.start( 'localhost', port ) do |http|
+      http.open_timeout = 1.0
+      http.read_timeout = 1.0
+      http.get( path )
+    end
+  end
+
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rjack-jetty
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 7
-    - 2
-    - 2
-    - 0
-  version: 7.2.2.0
+  prerelease: 
+  version: 7.4.1.0
 platform: java
 authors: 
   - David Kellum
@@ -15,26 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -08:00
+date: 2011-05-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-logback
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 9
-              - 18
             version: 0.9.18
         - - <
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 0
             version: "2.0"
     type: :development
     version_requirements: *id001
@@ -42,14 +31,11 @@ dependencies:
     name: rjack-tarpit
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 2
-              - 3
-            version: 1.2.3
+            version: 1.3.0
     type: :development
     version_requirements: *id002
 description: |-
@@ -92,16 +78,16 @@ files:
   - webapps/test/index.html
   - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty/jetty-continuation-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-http-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-io-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-rewrite-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-security-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-server-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-servlet-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-util-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-webapp-7.2.2.v20101205.jar
-  - lib/rjack-jetty/jetty-xml-7.2.2.v20101205.jar
+  - lib/rjack-jetty/jetty-continuation-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-http-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-io-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-rewrite-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-security-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-server-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-servlet-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-util-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-webapp-7.4.1.v20110513.jar
+  - lib/rjack-jetty/jetty-xml-7.4.1.v20110513.jar
   - lib/rjack-jetty/rjack-jetty-1.0.jar
   - lib/rjack-jetty/servlet-api-2.5.jar
 has_rdoc: true
@@ -115,23 +101,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
-rubyforge_project: rjack
-rubygems_version: 1.3.6
+rubyforge_project: rjack-jetty
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: "A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/] for JRuby:  * Provides jetty, jetty-util, servlet-api, and jetty-rewrite-handler jars"