rjack-jetty 6.1.26.0-java → 7.2.2.0-java

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 7.2.2.0 (2010-12-28)
+
+* Update to Jetty 7.2.2. This is major upgrade with broad java package
+  name changes, class name changes, and API changes. See
+  {Porting to Jetty 7}[http://wiki.eclipse.org/Jetty/Starting/Porting_to_Jetty_7]
+  for general details.  Some notable changes for gem users:
+  * {Handler.handle()}[http://download.eclipse.org/jetty/stable-7/apidocs/org/eclipse/jetty/server/Handler.html#handle%28java.lang.String,%20org.eclipse.jetty.server.Request,%20javax.servlet.http.HttpServletRequest,%20javax.servlet.http.HttpServletResponse%29] interface changed.
+  * Context renamed to ServletContextHandler.
+  * QueuedThreadPool no longer supports a low_threads (low resource) property.
+
 === 6.1.26.0 (2010-12-28)
 * Update to Jetty 6.1.26
 

data/Manifest.txt

@@ -14,8 +14,15 @@ test/test_jetty.rb
 webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty/jetty-6.1.26.jar
-lib/rjack-jetty/jetty-rewrite-handler-6.1.26.jar
-lib/rjack-jetty/jetty-util-6.1.26.jar
+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/rjack-jetty-1.0.jar
-lib/rjack-jetty/servlet-api-2.5-20081211.jar
+lib/rjack-jetty/servlet-api-2.5.jar

data/README.rdoc

@@ -75,43 +75,20 @@ permissions and limitations under the License.
 
 === Jetty Web Container (Java)
 
-Copyright (c) 1995-2006 Mort Bay Consulting Pty Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright (c) 1995-2009 Mort Bay Consulting Pty Ltd
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
+unless otherwise noted. It is dual licensed under the apache 2.0
+license and eclipse 1.0 license. Jetty may be distributed under
+either license.
 
-The javax.servlet package used by Jetty is copyright
-Sun Microsystems, Inc and Apache Software Foundation. It is
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
+The javax.servlet package used was sourced from the Apache
+Software Foundation and is distributed under the apache 2.0
+license.
 
-The UnixCrypt.java code ~Implements the one way cryptography used by
+The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
 modified April 2001  by Iris Van den Broeke, Daniel Deville.
 Permission to use, copy, modify and distribute UnixCrypt
 for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum
-  1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.

data/Rakefile

@@ -20,9 +20,9 @@ end
 
 t.jars =
   begin
-    mods = %w{ jetty jetty-util jetty-rewrite-handler }
-    l = mods.map { |n| "#{n}-#{ Jetty::JETTY_VERSION }.jar" }
-    l << "servlet-api-#{ Jetty::SERVLET_API_VERSION }-#{ Jetty::SERVLET_API_DATE }.jar"
+    mods = %w[ webapp xml servlet security server continuation http io util rewrite ]
+    l = mods.map { |n| "jetty-#{n}-#{ Jetty::JETTY_VERSION }.#{ Jetty::JETTY_BUILD }.jar" }
+    l << "servlet-api-#{ Jetty::SERVLET_API_VERSION }.jar"
     l << 'rjack-jetty-1.0.jar'
     l
   end
@@ -40,8 +40,8 @@ t.generated_files = 'webapps/test.war'
 t.assembly_version = 1.0
 
 task :check_pom_deps do
-  t.test_line_match( 'pom.xml',
-                     %r[<version>#{ Jetty::JETTY_VERSION }</version>] )
+  v = "#{ Jetty::JETTY_VERSION }.#{ Jetty::JETTY_BUILD }"
+  t.test_line_match( 'pom.xml', %r{<version>#{ v }</version>} )
 end
 task :check_history_version do
   t.test_line_match( 'History.rdoc', /^==/, / #{t.version} / )

data/assembly.xml

@@ -7,10 +7,17 @@
   <dependencySets>
     <dependencySet>
       <includes>
-        <include>org.mortbay.jetty:jetty</include>
-        <include>org.mortbay.jetty:jetty-util</include>
-        <include>org.mortbay.jetty:jetty-rewrite-handler</include>
-        <include>org.mortbay.jetty:servlet-api</include>
+        <include>org.eclipse.jetty:jetty-servlet</include>
+        <include>org.eclipse.jetty:jetty-security</include>
+        <include>org.eclipse.jetty:jetty-server</include>
+        <include>org.eclipse.jetty:jetty-continuation</include>
+        <include>org.eclipse.jetty:jetty-http</include>
+        <include>org.eclipse.jetty:jetty-io</include>
+        <include>org.eclipse.jetty:jetty-xml</include>
+        <include>org.eclipse.jetty:jetty-webapp</include>
+        <include>org.eclipse.jetty:jetty-util</include>
+        <include>org.eclipse.jetty:jetty-rewrite</include>
+        <include>javax.servlet:servlet-api</include>
         <include>rjack:rjack-jetty</include>
       </includes>
     </dependencySet>

data/lib/rjack-jetty.rb

@@ -25,31 +25,37 @@ module RJack
   module Jetty
 
     def self.require_jar( name )
-      require File.join( JETTY_DIR, "#{name}-#{ JETTY_VERSION }.jar" )
+      require File.join( JETTY_DIR, "#{name}-#{ JETTY_VERSION }.#{ JETTY_BUILD }.jar" )
     end
 
-    require_jar 'jetty'
+    require_jar 'jetty-io'
+    require_jar 'jetty-http'
+    require_jar 'jetty-continuation'
+    require_jar 'jetty-server'
+    require_jar 'jetty-security'
+    require_jar 'jetty-servlet'
+    require_jar 'jetty-xml'
+    require_jar 'jetty-webapp'
     require_jar 'jetty-util'
 
-    require File.join( JETTY_DIR,
-      "servlet-api-#{ SERVLET_API_VERSION }-#{ SERVLET_API_DATE }.jar" )
+    require File.join( JETTY_DIR, "servlet-api-#{ SERVLET_API_VERSION }.jar" )
 
-    import 'org.mortbay.jetty.Connector'
-    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'
-    import 'org.mortbay.jetty.handler.HandlerCollection'
-    import 'org.mortbay.jetty.handler.RequestLogHandler'
-    import 'org.mortbay.jetty.handler.ResourceHandler'
-    import 'org.mortbay.jetty.nio.SelectChannelConnector'
-    import 'org.mortbay.jetty.servlet.Context'
-    import 'org.mortbay.jetty.servlet.ServletHolder'
-    import 'org.mortbay.jetty.webapp.WebAppContext'
-    import 'org.mortbay.thread.QueuedThreadPool'
+    import 'org.eclipse.jetty.server.Connector'
+    import 'org.eclipse.jetty.server.Handler'
+    import 'org.eclipse.jetty.server.NCSARequestLog'
+    import 'org.eclipse.jetty.server.Server'
+    import 'org.eclipse.jetty.server.handler.AbstractHandler'
+    import 'org.eclipse.jetty.server.handler.ContextHandler'
+    import 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
+    import 'org.eclipse.jetty.server.handler.DefaultHandler'
+    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.servlet.ServletContextHandler'
+    import 'org.eclipse.jetty.servlet.ServletHolder'
+    import 'org.eclipse.jetty.webapp.WebAppContext'
+    import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
 
     # A factory for creating complete org.morbay.jetty.Server
     # instances. Provides a general purpose facade for setup including
@@ -67,7 +73,7 @@ module RJack
     #   factory.static_contexts[ '/html' ] = '/var/www/html'
     #
     #   # Implement custom handler and register it.
-    #   import 'org.mortbay.jetty.handler.AbstractHandler'
+    #   import 'org.eclipse.jetty.handler.AbstractHandler'
     #   class RedirectHandler < AbstractHandler
     #
     #     def initialize( redirects )
@@ -75,11 +81,11 @@ module RJack
     #       @redirects = redirects
     #     end
     #
-    #     def handle( target, request, response, dispatch )
+    #     def handle( target, base_request, request, response )
     #       goto = @redirects[ target ]
     #       unless goto.nil?
     #         response.send_redirect( goto )
-    #         request.handled = true
+    #         base_request.handled = true
     #       end
     #     end
     #   end
@@ -109,7 +115,7 @@ module RJack
     #
     class ServerFactory
       attr_accessor( :port, :max_idle_time_ms,
-                     :max_threads, :low_threads, :min_threads,
+                     :max_threads, :min_threads,
                      :static_contexts, :static_welcome_files,
                      :webapp_contexts,
                      :servlet_contexts,
@@ -119,7 +125,6 @@ module RJack
       def initialize
         @port                 = 0        # Use any available port
         @max_threads          = 20
-        @low_threads          = 0        # No low thread threshold
         @min_threads          = nil      # Compute from max_threads
         @max_idle_time_ms     = 10000
         @static_contexts      = {}
@@ -148,20 +153,19 @@ module RJack
         server
       end
 
-      # Return a org.mortbay.thread.ThreadPool implementation.
+      # Return a org.eclipse.thread.ThreadPool implementation.
       #
-      # This implementation creates a QueuedThreadPool with min_threads
-      # (default max_threads / 4), any low_threads, and max_threads
+      # This implementation creates a QueuedThreadPool with
+      # min_threads (default max_threads / 4), and max_threads
       # (default 20).
       def create_pool
         pool = QueuedThreadPool.new
         pool.min_threads = [ @min_threads || ( @max_threads / 4 ), 1 ].max
-        pool.low_threads = @low_threads
-        pool.max_threads = [ @max_threads, 2 ].max
+        pool.max_threads = [ @max_threads, 3 ].max
         pool
       end
 
-      # Return array of org.mortbay.jetty.Connector instances.
+      # Return array of org.eclipse.jetty.Connector instances.
       #
       # This implementation returns a single SelectChannelConnector
       # listening to the given port or an auto-selected avaiable
@@ -173,7 +177,7 @@ module RJack
         [ connector ]
       end
 
-      # Returns an Array of org.mortbay.jetty.Handler instances.
+      # Returns an Array of org.eclipse.jetty.Handler instances.
       #
       # This implementation concatenates create_pre_handlers and
       # create_post_handlers.
@@ -181,7 +185,7 @@ module RJack
         ( create_pre_handlers + create_post_handlers )
       end
 
-      # Returns an Array of "pre" org.mortbay.jetty.Handler instances.
+      # Returns an Array of "pre" org.eclipse.jetty.Handler instances.
       #
       # This implementation returns an array containing a single
       # ContextHandlerCollection which itself contains the context
@@ -198,7 +202,7 @@ module RJack
         end
       end
 
-      # Returns an Array of "post" org.mortbay.jetty.Handler instances.
+      # Returns an Array of "post" org.eclipse.jetty.Handler instances.
       #
       # This implementation returns a DefaultHandler instance, and any
       # handler returned by create_request_log_handler.
@@ -231,7 +235,7 @@ module RJack
       # Set a context of servlets given context_path, a servlets hash
       # (mapping path to Servlet), and options.
       def set_context_servlets( context_path, servlets,
-                                options = Context::NO_SESSIONS )
+                                options = ServletContextHandler::NO_SESSIONS )
         @servlet_contexts[ context_path ] = [ servlets, options ]
       end
 
@@ -239,7 +243,7 @@ module RJack
       def create_servlet_contexts( context_handler_collection )
         @servlet_contexts.each do |ctx, s_o|
           servlets, options = s_o
-          context = Context.new( context_handler_collection, ctx, options )
+          context = ServletContextHandler.new( context_handler_collection, ctx, options )
           servlets.each do |path, servlet|
             context.add_servlet( ServletHolder.new( servlet ), path )
           end

data/lib/rjack-jetty/base.rb

@@ -16,10 +16,10 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '6.1.26'
+    JETTY_VERSION = '7.2.2'
     VERSION = JETTY_VERSION + '.0'
+    JETTY_BUILD = 'v20101205'
     SERVLET_API_VERSION = '2.5'
-    SERVLET_API_DATE = '20081211'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:
   end

data/pom.xml

@@ -10,21 +10,33 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.26</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>7.2.2.v20101205</version>
     </dependency>
 
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>7.2.2.v20101205</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>7.2.2.v20101205</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>6.1.26</version>
+      <version>7.2.2.v20101205</version>
     </dependency>
 
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-rewrite-handler</artifactId>
-      <version>6.1.26</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-rewrite</artifactId>
+      <version>7.2.2.v20101205</version>
     </dependency>
 
   </dependencies>

data/test/test_jetty.rb

@@ -72,10 +72,10 @@ class TestJetty < Test::Unit::TestCase
   class TestHandler < AbstractHandler
     TEST_TEXT = 'test handler text'
 
-    def handle( target, request, response, dispatch )
+    def handle( target, base_request, request, response )
       response.content_type = "text/plain"
       response.writer.write( TEST_TEXT )
-      request.handled = true
+      base_request.handled = true
     end
   end
 

metadata

@@ -3,11 +3,11 @@ name: rjack-jetty
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-    - 6
-    - 1
-    - 26
+    - 7
+    - 2
+    - 2
     - 0
-  version: 6.1.26.0
+  version: 7.2.2.0
 platform: java
 authors: 
   - David Kellum
@@ -92,11 +92,18 @@ files:
   - webapps/test/index.html
   - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty/jetty-6.1.26.jar
-  - lib/rjack-jetty/jetty-rewrite-handler-6.1.26.jar
-  - lib/rjack-jetty/jetty-util-6.1.26.jar
+  - 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/rjack-jetty-1.0.jar
-  - lib/rjack-jetty/servlet-api-2.5-20081211.jar
+  - lib/rjack-jetty/servlet-api-2.5.jar
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
 licenses: []