Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

Changeset [3c07348b032f15a28994841ccb209da79190fe17] by Fabio Kung

Revision 3c07348b032f15a28994841ccb209da79190fe17, committed by Fabio Kung · June 18th, 2008 @ 05:33 PM

Merge branch 'master' of git://github.com/jdamick/jetty-rails into jdamick

Conflicts:

lib/jetty_rails/adapters/merb_adapter.rb

lib/jetty_rails/adapters/rails_adapter.rb

lib/jetty_rails/runner.rb

spec/jetty_rails/runner_spec.rb

http://github.com/fabiokung/jett...

22 changed files

A lib/jetty_rails/adapters/abstract_adapter.rb
A lib/jetty_rails/handler/public_directory_handler.rb
A lib/jetty_rails/handler/web_app_handler.rb
A lib/jetty_rails/server.rb
A lib/rdoc_fix.rb
A spec/config.yml
A spec/jetty_rails/config_file_spec.rb
A spec/jetty_rails_sample_1.yml
A spec/jetty_rails_sample_2.yml
M Manifest.txt
M README.txt
M bin/jetty_merb
M bin/jetty_rails
M config/hoe.rb
M lib/jetty_rails.rb
M lib/jetty_rails/adapters/merb_adapter.rb
M lib/jetty_rails/adapters/rails_adapter.rb
M lib/jetty_rails/jars.rb
M lib/jetty_rails/runner.rb
M spec/jetty_rails/runner_spec.rb
M spec/spec_helper.rb
M website/index.txt