@@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> - <version>0.9.5</version> + <version>0.9.6-SNAPSHOT</version> <name>JRuby-Rack</name> <url>http://jruby-rack.kenai.com/</url> <description> pom.xml @@ -37,7 +37,9 @@ public class RackServlet extends HttpServlet { @Override public void init(ServletConfig config) { - this.dispatcher = new DefaultServletDispatcher(new ServletRackContext(config.getServletContext())); + if (dispatcher == null) { + dispatcher = new DefaultServletDispatcher(new ServletRackContext(config.getServletContext())); + } } @Override src/main/java/org/jruby/rack/RackServlet.java @@ -7,30 +7,29 @@ package org.jruby.rack.servlet; import java.io.IOException; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jruby.rack.RackApplication; import org.jruby.rack.RackApplicationFactory; +import org.jruby.rack.RackContext; import org.jruby.rack.RackEnvironment; -import org.jruby.rack.RackServletContextListener; /** * * @author nicksieger */ public class DefaultServletDispatcher implements ServletDispatcher { - private ServletContext servletContext; + private RackContext context; - public DefaultServletDispatcher(ServletContext servletContext) { - this.servletContext = servletContext; + public DefaultServletDispatcher(RackContext servletContext) { + this.context = servletContext; } public void process(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final RackApplicationFactory rackFactory = getRackFactory(); + final RackApplicationFactory rackFactory = context.getRackFactory(); RackApplication app = null; try { app = rackFactory.getApplication(); @@ -44,27 +43,22 @@ public class DefaultServletDispatcher implements ServletDispatcher { } } - private RackApplicationFactory getRackFactory() { - return (RackApplicationFactory) - servletContext.getAttribute(RackServletContextListener.FACTORY_KEY); - } - private void handleException(Exception re, RackApplicationFactory rackFactory, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (response.isCommitted()) { - servletContext.log("Error: Couldn't handle error: response committed", re); + context.log("Error: Couldn't handle error: response committed", re); return; } response.reset(); - servletContext.log("Application Error", re); + context.log("Application Error", re); try { RackApplication errorApp = rackFactory.getErrorApplication(); request.setAttribute(RackEnvironment.EXCEPTION, re); errorApp.call(new ServletRackEnvironment(request)).respond(new ServletRackResponseEnvironment(response)); } catch (Exception e) { - servletContext.log("Error: Couldn't handle error", e); + context.log("Error: Couldn't handle error", e); response.sendError(500); } } src/main/java/org/jruby/rack/servlet/DefaultServletDispatcher.java @@ -6,6 +6,6 @@ module JRuby module Rack - VERSION = "0.9.5" + VERSION = "0.9.6-SNAPSHOT" end end src/main/ruby/jruby/rack/version.rb @@ -11,8 +11,8 @@ import org.jruby.rack.servlet.DefaultServletDispatcher describe DefaultServletDispatcher do before :each do @rack_factory = org.jruby.rack.RackApplicationFactory.impl {} - @servlet_context.should_receive(:getAttribute).with("rack.factory").and_return @rack_factory - @dispatcher = DefaultServletDispatcher.new @servlet_context + @rack_context.should_receive(:getRackFactory).and_return @rack_factory + @dispatcher = DefaultServletDispatcher.new @rack_context end describe "process" do src/spec/ruby/rack/dispatcher_spec.rb 805edcc003f96c4eb30b073f24b35cd92dce056a Nick Sieger nick@nicksieger.com http://github.com/nicksieger/jruby-rack/commit/e173b4856e47afe2146642164b4eacf0baa52881 e173b4856e47afe2146642164b4eacf0baa52881 2009-09-13T15:23:13-07:00 2009-09-13T15:23:13-07:00 Loosen up servlet dispatcher contract to RackContext - Bump version to 0.9.6 for development d87cd2cfd4c038f8aff1e605201fe601d430ef2f Nick Sieger nick@nicksieger.com