rjack-jetty 7.6.16.0-java → 9.0.0.0-java

data/History.rdoc

@@ -1,26 +1,14 @@
-=== 7.6.16.0 (2015-1-23)
-* Update to Jetty 7.6.16.v20140903
-
-=== 7.6.15.0 (2014-8-18)
-* Update to Jetty 7.6.15.v20140411
-
-=== 7.6.14.0 (2013-11-7)
-* Update to Jetty 7.6.14.v20131031
-
-=== 7.6.13.0 (2013-9-23)
-* Update to Jetty 7.6.13.v20130916
-
-=== 7.6.12.0 (2013-8-6)
-* Update to Jetty 7.6.12.v20130726
-
-=== 7.6.11.0 (2013-5-28)
-* Update to Jetty 7.6.11.v20130520
-
-=== 7.6.10.0 (2013-3-14)
-* Update to Jetty 7.6.10.v20130312
-
-=== 7.6.9.0 (2013-2-5)
-* Update to Jetty 7.6.9.v20130131
+=== 9.0.0.0 (2012-12-13)
+* Update to Jetty 9.0.0.M3. Note this a major upgrade and currently
+  only a milestone release.  The server itself appears to be quite
+  stable while jetty-client, which was rewritten, is still undergoing
+  changes. An upstream M4 is expected and will be provided here as
+  9.0.0.1, and so on until a final release is provided.
+* Includes javax.servlet 3.0.0
+* There are a few potentially breaking interface changes to the
+  provided RJack::Jetty::ServerFactory, for example create_connectors
+  now takes a server parameter.
+* The minimum thread count is raised to 7 (per testing).
 
 === 7.6.8.0 (2012-11-9)
 * Update to Jetty 7.6.8.v20121106

data/Manifest.txt

@@ -15,16 +15,16 @@ test/test_jetty.rb
 webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty/jetty-client-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-continuation-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-http-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-io-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-rewrite-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-security-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-server-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-servlet-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-util-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-webapp-7.6.16.v20140903.jar
-lib/rjack-jetty/jetty-xml-7.6.16.v20140903.jar
+lib/rjack-jetty/javax.servlet-3.0.0.v201112011016.jar
+lib/rjack-jetty/jetty-client-9.0.0.M3.jar
+lib/rjack-jetty/jetty-continuation-9.0.0.M3.jar
+lib/rjack-jetty/jetty-http-9.0.0.M3.jar
+lib/rjack-jetty/jetty-io-9.0.0.M3.jar
+lib/rjack-jetty/jetty-rewrite-9.0.0.M3.jar
+lib/rjack-jetty/jetty-security-9.0.0.M3.jar
+lib/rjack-jetty/jetty-server-9.0.0.M3.jar
+lib/rjack-jetty/jetty-servlet-9.0.0.M3.jar
+lib/rjack-jetty/jetty-util-9.0.0.M3.jar
+lib/rjack-jetty/jetty-webapp-9.0.0.M3.jar
+lib/rjack-jetty/jetty-xml-9.0.0.M3.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar
-lib/rjack-jetty/servlet-api-2.5.jar

data/README.rdoc

@@ -6,15 +6,17 @@
 
 == Description
 
-A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/]
+A gem packaging of the {Jetty Web Server}[http://www.eclipse.org/jetty/]
 for JRuby:
 
-* Provides jetty, jetty-util, servlet-api, and jetty-rewrite-handler
-  jars.
-* A Jetty::ServerFactory for simple programmatic server setup in ruby.
+* Provides all common jetty server jars and some optional jars like,
+  -util, -rewrite, -continuation
+* jetty-client (via <tt>require rjack-jetty/client</tt>)
+* javax.servlet 3.0.0
+* A Jetty::ServerFactory for simple programmatic server setup in ruby
 * A set of Jetty::TestServlets containing a SnoopServlet and
-  PerfTestServlet (implemented in Java).
-* A jetty-service bin script for easy testing from the command line.
+  PerfTestServlet (implemented in Java)
+* A jetty-service bin script for easy testing from the command line
 
 Note that JSP support is provided separately in the companion
 jetty-jsp[http://rjack.rubyforge.org/jetty-jsp/] gem.
@@ -76,7 +78,7 @@ permissions and limitations under the License.
 
 === Jetty Web Container (Java)
 
-Copyright (c) 1995-2009 Mort Bay Consulting Pty Ltd
+Copyright (c) 1995-2012 Mort Bay Consulting Pty Ltd
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
 unless otherwise noted. It is dual licensed under the apache 2.0

data/assembly.xml

@@ -18,7 +18,7 @@
         <include>org.eclipse.jetty:jetty-util</include>
         <include>org.eclipse.jetty:jetty-rewrite</include>
         <include>org.eclipse.jetty:jetty-client</include>
-        <include>javax.servlet:servlet-api</include>
+        <include>org.eclipse.jetty.orbit:javax.servlet</include>
         <include>rjack:rjack-jetty</include>
       </includes>
     </dependencySet>

data/lib/rjack-jetty.rb

@@ -38,7 +38,8 @@ module RJack
     require_jar 'jetty-webapp'
     require_jar 'jetty-util'
 
-    require File.join( JETTY_DIR, "servlet-api-#{ SERVLET_API_VERSION }.jar" )
+    require File.join( JETTY_DIR,
+      "javax.servlet-#{ SERVLET_API_VERSION }.#{ SERVLET_API_BUILD }.jar" )
 
     import 'org.eclipse.jetty.server.Connector'
     import 'org.eclipse.jetty.server.Handler'
@@ -51,7 +52,7 @@ module RJack
     import 'org.eclipse.jetty.server.handler.HandlerCollection'
     import 'org.eclipse.jetty.server.handler.RequestLogHandler'
     import 'org.eclipse.jetty.server.handler.ResourceHandler'
-    import 'org.eclipse.jetty.server.nio.SelectChannelConnector'
+    import 'org.eclipse.jetty.server.ServerConnector'
     import 'org.eclipse.jetty.servlet.ServletContextHandler'
     import 'org.eclipse.jetty.servlet.ServletHolder'
     import 'org.eclipse.jetty.webapp.WebAppContext'
@@ -140,14 +141,12 @@ module RJack
       # Returns a new org.morbay.jetty.Server that is ready to
       # be started.
       def create
-        server = Server.new
+        server = Server.new( create_pool )
 
-        server.thread_pool = create_pool
-
-        server.connectors = create_connectors.to_java( Connector )
+        server.connectors = create_connectors( server )
 
         hcol = HandlerCollection.new
-        hcol.handlers = create_handlers.compact.to_java( Handler )
+        hcol.handlers = create_handlers.compact
         server.handler = hcol
 
         server.stop_at_shutdown = @stop_at_shutdown
@@ -163,19 +162,19 @@ module RJack
       def create_pool
         pool = QueuedThreadPool.new
         pool.min_threads = [ @min_threads || ( @max_threads / 4 ), 4 ].max
-        pool.max_threads = [ @max_threads, 5 ].max
+        pool.max_threads = [ @max_threads, 7 ].max
         pool
       end
 
       # Return array of org.eclipse.jetty.Connector instances.
       #
-      # This implementation returns a single SelectChannelConnector
+      # This implementation returns a single ServerConnector
       # listening to the given port or an auto-selected avaiable
       # port. Connections are retained for max_idle_time_ms.
-      def create_connectors
-        connector = SelectChannelConnector.new
+      def create_connectors( server )
+        connector = ServerConnector.new( server )
         connector.port = @port
-        connector.max_idle_time = @max_idle_time_ms
+        connector.idle_timeout = @max_idle_time_ms
         [ connector ]
       end
 
@@ -229,8 +228,7 @@ module RJack
           ch = ContextHandler.new( context_handler_collection, ctx )
           ch.resource_base = rpath
           ch.handler = ResourceHandler.new
-          ch.handler.welcome_files =
-            @static_welcome_files.to_java( java.lang.String )
+          ch.handler.welcome_files = @static_welcome_files
         end
       end
 

data/lib/rjack-jetty/base.rb

@@ -16,10 +16,11 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '7.6.16'
+    JETTY_VERSION = '9.0.0'
     VERSION = JETTY_VERSION + '.0'
-    JETTY_BUILD = 'v20140903'
-    SERVLET_API_VERSION = '2.5'
+    JETTY_BUILD = 'M3'
+    SERVLET_API_VERSION = '3.0.0'
+    SERVLET_API_BUILD = 'v201112011016'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:
   end

data/pom.xml

@@ -16,43 +16,43 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>7.6.16.v20140903</version>
+      <version>9.0.0.M3</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.6.16.v20140903</version>
+      <version>9.0.0.M3</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>7.6.16.v20140903</version>
+      <version>9.0.0.M3</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>7.6.16.v20140903</version>
+      <version>9.0.0.M3</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>7.6.16.v20140903</version>
+      <version>9.0.0.M3</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>7.6.16.v20140903</version>
+      <version>9.0.0.M3</version>
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>9.0.0.M3</version>
     </dependency>
 
   </dependencies>

metadata

@@ -1,77 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: rjack-jetty
 version: !ruby/object:Gem::Version
-  version: 7.6.16.0
+  prerelease:
+  version: 9.0.0.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: rjack-slf4j
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.5
     - - <
       - !ruby/object:Gem::Version
         version: '1.8'
-  name: rjack-slf4j
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.5
     - - <
       - !ruby/object:Gem::Version
         version: '1.8'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: rjack-logback
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-  name: rjack-logback
+    none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
+        version: '2.2'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
-  name: minitest
+    none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rjack-tarpit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
+        version: '2.0'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
-  name: rjack-tarpit
+        version: '2.0'
+    none: false
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
 description:
 email:
 - dek-oss@gravitext.com
@@ -99,22 +108,21 @@ files:
 - webapps/test/index.html
 - webapps/test/WEB-INF/web.xml
 - webapps/test.war
-- lib/rjack-jetty/jetty-client-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-continuation-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-http-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-io-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-rewrite-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-security-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-server-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-servlet-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-util-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-webapp-7.6.16.v20140903.jar
-- lib/rjack-jetty/jetty-xml-7.6.16.v20140903.jar
+- lib/rjack-jetty/javax.servlet-3.0.0.v201112011016.jar
+- lib/rjack-jetty/jetty-client-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-continuation-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-http-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-io-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-rewrite-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-security-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-server-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-servlet-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-util-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-webapp-9.0.0.M3.jar
+- lib/rjack-jetty/jetty-xml-9.0.0.M3.jar
 - lib/rjack-jetty/rjack-jetty-1.0.jar
-- lib/rjack-jetty/servlet-api-2.5.jar
 homepage: http://rjack.rubyforge.org/jetty
 licenses: []
-metadata: {}
 post_install_message:
 rdoc_options:
 - --main
@@ -123,18 +131,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2
+  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 1.8.24
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: A gem packaging of the Jetty Web Server for JRuby.
 test_files: []
+...

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e91a79834babfba39321057640120fffafa6385f
-  data.tar.gz: aedeb948d48775026a2e274de9161f0fca6a14ef
-SHA512:
-  metadata.gz: f83c53683f201be568892de80d3385cef4d292db17deadfc2037324f56a1e37ab599e1b29b0f93cbb1a58086c0a0fd799d753350b461a8d7b9fd56e015308942
-  data.tar.gz: 0dcaef095a11bc9cfc6177f4b1bd28cf4da310c3097ba9d150881cd7d389c2f9a4a240f610777665f8eef8e780126484a925cd0a08c338cc8a9332b299a88d2e