upgrading to jetty-6.1.11, adding JSP and EL support

Manifest.txt

@@ -9,9 +9,13 @@ bin/jetty_merb
 bin/jetty_rails
 config/hoe.rb
 config/requirements.rb
-lib/jetty-6.1.9.jar
-lib/jetty-plus-6.1.9.jar
-lib/jetty-util-6.1.9.jar
+jetty-libs/core-3.1.1.jar
+jetty-libs/jetty-6.1.11.jar
+jetty-libs/jetty-plus-6.1.11.jar
+jetty-libs/jetty-util-6.1.11.jar
+jetty-libs/jsp-2.1.jar
+jetty-libs/jsp-api-2.1.jar
+jetty-libs/servlet-api-2.5-6.1.11.jar
 lib/jetty_rails.rb
 lib/jetty_rails/adapters/abstract_adapter.rb
 lib/jetty_rails/adapters/merb_adapter.rb
@@ -27,7 +31,6 @@ lib/jetty_rails/server.rb
 lib/jetty_rails/version.rb
 lib/jetty_rails/warbler_reader.rb
 lib/jruby-rack-0.9.2.jar
-lib/servlet-api-2.5-6.1.9.jar
 script/console
 script/destroy
 script/generate
@@ -46,4 +49,4 @@ spec/spec_helper.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake
-tasks/website.rake
+tasks/website.rake

bin/jetty_merb

@@ -33,6 +33,7 @@
 
 require "java"
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../jetty-libs"
 require "jetty_rails"
 
 options = CommandLineReader.new.read(:merb)

bin/jetty_rails

@@ -33,6 +33,7 @@
 
 require "java"
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../jetty-libs"
 require "jetty_rails"
 
 options = CommandLineReader.new.read(:rails)

lib/jetty_rails/jars.rb

@@ -1,9 +1,12 @@
 module JettyRails
 
-  require "jetty-6.1.9"
-  require "servlet-api-2.5-6.1.9"
-  require "jetty-util-6.1.9"
-  require "jetty-plus-6.1.9"
+  require "servlet-api-2.5-6.1.11"
+  require "jetty-6.1.11"
+  require "jetty-util-6.1.11"
+  require "jetty-plus-6.1.11"
+  require "core-3.1.1"
+  require "jsp-api-2.1"
+  require "jsp-2.1"
   module Jetty
     include_package "org.mortbay.jetty"
     include_package "org.mortbay.jetty.servlet"

spec/jetty_rails/runner_spec.rb

@@ -31,10 +31,10 @@
     runner.servers[8080].config[:port].should == 8080
   end
 
-  it "should default lib_dir to lib/*.jar" do
+  it "should default lib_dir to lib" do
     runner = JettyRails::Runner.new :base => Dir.pwd
     runner.servers[8080].config.should have_key(:lib_dir)
-    runner.servers[8080].config[:lib_dir].should == 'lib/**/*.jar'
+    runner.servers[8080].config[:lib_dir].should == 'lib'
   end
 
   it "should set rails root" do

spec/spec_helper.rb

@@ -7,5 +7,6 @@
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../jetty-libs')
 require 'jetty_rails'
 require 'yaml'