src/main/java/org/jruby/rack/servlet/DefaultServletDispatcher.java src/main/java/org/jruby/rack/servlet/ServletDispatcher.java src/main/java/org/jruby/rack/servlet/ServletRackContext.java src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java src/main/java/org/jruby/rack/servlet/ServletRackResponseEnvironment.java @@ -6,6 +6,8 @@ package org.jruby.rack; +import org.jruby.rack.servlet.DefaultServletDispatcher; +import org.jruby.rack.servlet.ServletDispatcher; import java.io.IOException; import javax.servlet.Filter; import javax.servlet.FilterChain; src/main/java/org/jruby/rack/RackFilter.java @@ -6,6 +6,8 @@ package org.jruby.rack; +import org.jruby.rack.servlet.DefaultServletDispatcher; +import org.jruby.rack.servlet.ServletDispatcher; import java.io.IOException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; src/main/java/org/jruby/rack/RackServlet.java @@ -6,6 +6,7 @@ package org.jruby.rack; +import org.jruby.rack.servlet.ServletRackContext; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; src/main/java/org/jruby/rack/RackServletContextListener.java @@ -1,5 +1,6 @@ package org.jruby.rack; +import org.jruby.rack.servlet.ServletRackEnvironment; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.jsp.tagext.TagSupport; src/main/java/org/jruby/rack/RackTag.java @@ -9,7 +9,7 @@ package org.jruby.rack.jms; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.jruby.rack.ServletRackContext; +import org.jruby.rack.servlet.ServletRackContext; /** * src/main/java/org/jruby/rack/jms/QueueContextListener.java @@ -6,7 +6,7 @@ require File.dirname(__FILE__) + '/../spec_helper' -import org.jruby.rack.DefaultServletDispatcher +import org.jruby.rack.servlet.DefaultServletDispatcher describe DefaultServletDispatcher do before :each do src/spec/ruby/rack/dispatcher_spec.rb @@ -13,7 +13,7 @@ describe Rack::Handler::Servlet, "create_env" do before :each do @servlet = Rack::Handler::Servlet.new(nil) @servlet_env = mock "servlet request" - @env = org.jruby.rack.ServletRackEnvironment.new @servlet_env + @env = org.jruby.rack.servlet.ServletRackEnvironment.new @servlet_env @servlet_env.stub!(:getAttributeNames).and_return enumeration([]) end src/spec/ruby/rack/handler/servlet_spec.rb @@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../spec_helper' import org.jruby.rack.RackServlet -import org.jruby.rack.ServletRackContext +import org.jruby.rack.servlet.ServletRackContext describe RackServlet, "service" do it "should delegate to process" do src/spec/ruby/rack/servlet_spec.rb src/main/java/org/jruby/rack/DefaultServletDispatcher.java src/main/java/org/jruby/rack/ServletDispatcher.java src/main/java/org/jruby/rack/ServletRackContext.java src/main/java/org/jruby/rack/ServletRackEnvironment.java src/main/java/org/jruby/rack/ServletRackResponseEnvironment.java b0481d23d273801767f00ddc6c472ff57f0ddc50 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/jruby-rack/commit/715aa3c7ec62bdfa389d79bb701520c546efa3ac 715aa3c7ec62bdfa389d79bb701520c546efa3ac 2008-12-28T22:45:34-08:00 2008-12-28T22:45:34-08:00 Move all non-top-level API servlet-related classes to org.jruby.rack.servlet 732abb6fd320ed47bcb3dfb0c0aed174014e7fc6 Nick Sieger nick@nicksieger.com