src/main/ruby/action_controller/session/java_servlet_store.rb src/spec/ruby/action_controller/session/java_servlet_store_spec.rb src/spec/ruby/rails/action_controller/session.rb @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> <application>jruby-rack</application> - <version>1</version> + <version>2</version> <static-files/> examples/rails/appengine-web.xml @@ -14,3 +14,8 @@ ActionController::Base.session = { # which shouldn't be used to store highly confidential information # (create the session table with "rake db:sessions:create") # ActionController::Base.session_store = :active_record_store + +# if defined?($servlet_context) +# require 'action_controller/session/java_servlet_store' +# ActionController::Base.session_store = :java_servlet_store +# end examples/rails/config/initializers/session_store.rb @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponseWrapper; import org.jruby.rack.servlet.DefaultServletDispatcher; import org.jruby.rack.servlet.ServletDispatcher; +import org.jruby.rack.servlet.ServletRackContext; /** * @@ -39,7 +40,7 @@ public class RackFilter implements Filter { /** Construct a new dispatcher with the servlet context */ public void init(FilterConfig config) throws ServletException { - dispatcher = new DefaultServletDispatcher(config.getServletContext()); + dispatcher = new DefaultServletDispatcher(new ServletRackContext(config.getServletContext())); } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) src/main/java/org/jruby/rack/RackFilter.java @@ -57,6 +57,7 @@ public class DefaultServletDispatcher implements ServletDispatcher { return; } response.reset(); + servletContext.log("Application Error", re); try { RackApplication errorApp = rackFactory.getErrorApplication(); src/main/java/org/jruby/rack/servlet/DefaultServletDispatcher.java bb907c03c48eb999e7d099068245b91eeda545bf Nick Sieger nick@nicksieger.com http://github.com/nicksieger/jruby-rack/commit/8b5c5f1bca6e1bc072c205b476c655b5f693ba85 8b5c5f1bca6e1bc072c205b476c655b5f693ba85 2009-06-20T00:16:27-07:00 2009-06-20T00:16:27-07:00 Merge rack servlet session store - still needs some work to get going on GAE 8fcbea07e7c16a88da94a3dec55f659b3fe7fa12 Nick Sieger nick@nicksieger.com