jetty-rackup 0.2.0 → 7.0.0

data/README.markdown

@@ -52,6 +52,7 @@ the official web sites of the respective projects:
 * <http://jetty.codehaus.org/jetty/>
 * <http://kenai.com/projects/jruby-rack/pages/Home>
 
+The major gem version (7) now matches the used jetty version.
 
 FAQ
 ---
@@ -60,6 +61,11 @@ FAQ
 
     jruby -J-Xmx2048m  /usr/local/lib/jetty-rackup/jetty-rackup config.ru
 
+TODO
+----
+
+Tests ;-)
+
 See also
 --------
 For Rails deployment you may prefer jetty-rails 
@@ -73,11 +79,11 @@ Copyright
 
 Author
 ------
-Vladimir Dobriakov, innoQ Deutschland GmbH 
-<http://blog.geekq.net>, <http://www.innoq.com/blog/vd>
+Vladimir Dobriakov
+<http://blog.geekq.net>, <http://www.mobile-web-consulting.de>
 
 With contributions by [Leandro Silva](http://leandrosilva.com.br/) and
-[Jason Rogers](http://wordsanddeeds.org/)
+Jason Rogers.
 
 Further Credits
 ---------------
@@ -85,5 +91,6 @@ Further Credits
   application. <http://michal.hantl.cz/>
 * Nick Sieger for the explanation of servlet context init params and of 
   course jruby-rack itself. <http://blog.nicksieger.com/>
+* Thanks to [Nik](https://github.com/11xor6) for the Jetty 7.0 port.
 
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+7.0.0

data/lib/jetty-rackup/server.rb

@@ -3,38 +3,37 @@ class Rack::Handler::Jetty
     Dir["#{File.dirname(__FILE__)}/../../jars/*.jar"].each { |jar| require jar }
 
     include_class 'javax.servlet.http.HttpServlet'
-    include_class 'org.mortbay.jetty.Server'
-    include_class 'org.mortbay.jetty.servlet.Context'
-    include_class 'org.mortbay.jetty.servlet.ServletHolder'
+    include_class 'org.eclipse.jetty.server.Server'
+    include_class 'org.eclipse.jetty.servlet.ServletContextHandler'
+    include_class 'org.eclipse.jetty.servlet.ServletHolder'
     include_class 'org.jruby.rack.servlet.ServletRackContext'
-    include_class 'org.mortbay.jetty.handler.ResourceHandler'
-    include_class 'org.mortbay.jetty.handler.DefaultHandler'
-    include_class 'org.mortbay.jetty.handler.HandlerList'
-    include_class 'org.mortbay.jetty.handler.ContextHandlerCollection'
-    include_class 'org.mortbay.jetty.servlet.DefaultServlet'
+    include_class 'org.eclipse.jetty.server.handler.ResourceHandler'
+    include_class 'org.eclipse.jetty.server.handler.DefaultHandler'
+    include_class 'org.eclipse.jetty.server.handler.HandlerList'
+    include_class 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
+    include_class 'org.eclipse.jetty.servlet.DefaultServlet'
 
-    jetty = org.mortbay.jetty.Server.new options[:Port]
+    jetty = org.eclipse.jetty.server.Server.new options[:Port]
 
-    context = org.mortbay.jetty.servlet.Context.new(nil, "/", org.mortbay.jetty.servlet.Context::NO_SESSIONS)
-    context.add_filter("org.jruby.rack.RackFilter", "/*", org.mortbay.jetty.Handler::DEFAULT)
+    context = org.eclipse.jetty.servlet.ServletContextHandler.new(nil, "/", org.eclipse.jetty.servlet.ServletContextHandler::NO_SESSIONS)
+    context.add_filter("org.jruby.rack.RackFilter", "/*", 0)
     context.set_resource_base(File.dirname(__FILE__))
     context.add_event_listener(org.jruby.rack.RackServletContextListener.new)
 
-    context.set_init_params(java.util.HashMap.new(
-      'org.mortbay.jetty.servlet.Default.relativeResourceBase' => '/public',
-      'rackup' => rackup_content,
-      'jruby.max.runtimes' => '1'))
-      
-    context.add_servlet(org.mortbay.jetty.servlet.ServletHolder.new(
-      org.mortbay.jetty.servlet.DefaultServlet.new), "/")
-    
+    context.set_init_parameter('org.eclipse.jetty.servlet.Default.relativeResourceBase', '/public')
+    context.set_init_parameter('rackup', rackup_content)
+    context.set_init_parameter('jruby.max.runtimes', '1')
+
+    context.add_servlet(org.eclipse.jetty.servlet.ServletHolder.new(
+                            org.eclipse.jetty.servlet.DefaultServlet.new), "/")
+
     JRuby.runtime.jruby_class_loader.add_url(java.io.File.new("WEB-INF/classes").to_url)
 
     Dir["WEB-INF/lib/**/*.jar"].each do |jar|
       JRuby.runtime.jruby_class_loader.add_url(java.io.File.new(jar).to_url)
     end
-    
+
     jetty.set_handler(context)
     jetty.start
   end
-end
+end

metadata

@@ -3,10 +3,10 @@ name: jetty-rackup
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 7
   - 0
-  - 2
   - 0
-  version: 0.2.0
+  version: 7.0.0
 platform: ruby
 authors: 
 - Vladimir Dobriakov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 +01:00
+date: 2012-01-02 00:00:00 +01:00
 default_executable: jetty-rackup
 dependencies: []
 
@@ -30,7 +30,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
@@ -46,10 +45,14 @@ files:
 - examples/using_java/java/Other.java
 - examples/using_java/java/Some.java
 - jars/core-3.1.1.jar
-- jars/jetty-6.1.14.jar
-- jars/jetty-plus-6.1.14.jar
-- jars/jetty-util-6.1.14.jar
-- jars/jruby-rack-0.9.5.jar
+- jars/jetty-continuation-7.2.2.v20101205.jar
+- jars/jetty-http-7.2.2.v20101205.jar
+- jars/jetty-io-7.2.2.v20101205.jar
+- jars/jetty-security-7.2.2.v20101205.jar
+- jars/jetty-server-7.2.2.v20101205.jar
+- jars/jetty-servlet-7.2.2.v20101205.jar
+- jars/jetty-util-7.2.2.v20101205.jar
+- jars/jruby-rack-1.1.2.jar
 - jars/jsp-2.1.jar
 - jars/jsp-api-2.1.jar
 - jars/servlet-api-2.5-6.1.14.jar
@@ -63,8 +66,8 @@ homepage: http://github.com/geekq/jetty-rackup
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -88,8 +91,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rack + Jetty = Retty
-test_files: 
-- test/test_jetty-rackup.rb
-- test/helper.rb
-- examples/just_ruby/app.rb
-- examples/using_java/app.rb
+test_files: []
+

data/.gitignore

@@ -1 +0,0 @@
-.DS_Store