jetty-rails 0.6 → 0.7

data/History.txt

@@ -1,3 +1,11 @@
+== 0.7
+* Merb 1.0 support!
+* jruby-rack updated to the latest release (0.9.3)
+* jetty server update to 6.1.14
+* adding known issue with jruby-1.1.4 to the docs
+* JSP and JSP Expression Language support
+* some minor bugs
+
 == 0.6
 * load all java classes inside classes/ by default
 * command line args to customize lib/ and classes/ directories

data/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.14.jar
+jetty-libs/jetty-plus-6.1.14.jar
+jetty-libs/jetty-util-6.1.14.jar
+jetty-libs/jsp-2.1.jar
+jetty-libs/jsp-api-2.1.jar
+jetty-libs/servlet-api-2.5-6.1.14.jar
 lib/jetty_rails.rb
 lib/jetty_rails/adapters/abstract_adapter.rb
 lib/jetty_rails/adapters/merb_adapter.rb
@@ -26,8 +30,7 @@ lib/jetty_rails/runner.rb
 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
+lib/jruby-rack-0.9.3.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

data/README.txt

@@ -19,6 +19,8 @@ The project has born from my own needs. I needed to run JForum (http://jforum.ne
 
 == KNOWN ISSUES
 
+* Doesn't work with JRuby 1.1.4: http://jira.codehaus.org/browse/JRUBY-2959
+
 * To generate coverage report with jruby (>= 1.1) follow instructions from http://www.ruby-forum.com/topic/146252 and run (inside jetty-rails root dir):
 jruby -S rake rcov
 

data/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)

data/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)

data/config/hoe.rb

@@ -61,6 +61,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = EXTRA_DEPENDENCIES
+  p.rdoc_pattern = /^(lib|bin|ext).*[^\.jar]$|txt$/
 
   # A hash of extra values to set in the gemspec.
   # p.spec_extras = {

data/lib/jetty_rails/config/command_line_reader.rb

@@ -15,7 +15,7 @@ class CommandLineReader
       :merb => {
         :base => Dir.pwd,
         :port => 4000,
-        :config_file => "#{File.join(Dir.pwd, 'jetty_merb.yml')}",
+        :config_file => "#{File.join(Dir.pwd, 'config', 'jetty_merb.yml')}",
         :adapter => :merb
       }
     }

data/lib/jetty_rails/handler/web_app_handler.rb

@@ -9,7 +9,9 @@ module JettyRails
 
         # create an isolated classloader per application context
         self.class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+        
         self.resource_base = config[:base]
+        self.descriptor = config[:web_xml]
         
         add_classes_dir_to_classpath(config)
         add_lib_dir_jars_to_classpath(config)
@@ -50,7 +52,7 @@ module JettyRails
       
       private
       def add_lib_dir_jars_to_classpath(config)
-        lib_dir = "#{config[:base]}/#{config[:lib_dir]}"
+        lib_dir = "#{config[:base]}/#{config[:lib_dir]}/**/*.jar"
         Dir[lib_dir].each do |jar|
           url = java.io.File.new(jar).to_url
           self.class_loader.add_url(url)

data/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.14"
+  require "jetty-6.1.14"
+  require "jetty-util-6.1.14"
+  require "jetty-plus-6.1.14"
+  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"
@@ -17,7 +20,7 @@ module JettyRails
     end
   end
 
-  require "jruby-rack-0.9.2"
+  require "jruby-rack-0.9.3"
   module Rack
     include_package "org.jruby.rack"
     include_package "org.jruby.rack.rails"

data/lib/jetty_rails/server.rb

@@ -8,8 +8,9 @@ module JettyRails
       :adapter => :rails, 
       :environment => 'development',
       :context_path => '/',
-      :lib_dir => 'lib/**/*.jar',
+      :lib_dir => 'lib',
       :classes_dir => 'classes',
+      :web_xml => 'config/web.xml',
       :port => 8080,
       :jruby_min_runtimes => 1,
       :jruby_max_runtimes => 5,

data/lib/jetty_rails/version.rb

@@ -1,7 +1,7 @@
 module JettyRails #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
 
     STRING = [MAJOR, MINOR].join('.')
   end

data/spec/jetty_merb_spec.rb

@@ -10,7 +10,7 @@ describe "binary executable with no command line arguments" do
       config[:adapter].should == :merb
       runner
     end
-    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'      
   end
   
   it "should provide the current execution dir as basedir" do

data/spec/jetty_rails/runner_spec.rb

@@ -31,10 +31,10 @@ describe JettyRails::Runner, "with no extra configuration (rails adapter)" do
     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

data/spec/spec_helper.rb

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

metadata

@@ -1,15 +1,16 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 extensions: []
+
 homepage: http://jetty-rails.rubyforge.org
 executables: 
 - jetty_merb
 - jetty_rails
-version: !ruby/object:Gem::Version
-  version: !str 0.6
+version: !ruby/object:Gem::Version 
+  version: "0.7"
 post_install_message: |
   
   For more information on jetty-rails, see http://jetty-rails.rubyforge.org
-date: 2008-09-11 03:00:00 +00:00
+date: 2008-11-28 02:00:00 +00:00
 files: 
 - History.txt
 - Licenses.txt
@@ -22,9 +23,13 @@ files:
 - 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.14.jar
+- jetty-libs/jetty-plus-6.1.14.jar
+- jetty-libs/jetty-util-6.1.14.jar
+- jetty-libs/jsp-2.1.jar
+- jetty-libs/jsp-api-2.1.jar
+- jetty-libs/servlet-api-2.5-6.1.14.jar
 - lib/jetty_rails.rb
 - lib/jetty_rails/adapters/abstract_adapter.rb
 - lib/jetty_rails/adapters/merb_adapter.rb
@@ -39,8 +44,7 @@ files:
 - 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
+- lib/jruby-rack-0.9.3.jar
 - script/console
 - script/destroy
 - script/generate
@@ -60,30 +64,31 @@ files:
 - tasks/environment.rake
 - tasks/rspec.rake
 - tasks/website.rake
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 rdoc_options: 
 - --main
 - README.txt
 signing_key: 
 cert_chain: []
+
 name: jetty-rails
 has_rdoc: true
 platform: ruby
 summary: jetty server for rails applications
 default_executable: 
 bindir: bin
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   version: 
   requirements: 
   - - '>='
-    - !ruby/object:Gem::Version
-      version: !str 0
-required_ruby_version: !ruby/object:Gem::Requirement
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement 
   version: 
   requirements: 
   - - '>='
-    - !ruby/object:Gem::Version
-      version: !str 0
+    - !ruby/object:Gem::Version 
+      version: "0"
 require_paths: 
 - lib
 specification_version: 2
@@ -94,26 +99,26 @@ test_files:
 - spec/jetty_rails/runner_spec.rb
 - spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 dependencies: 
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   type: :runtime
   name: activesupport
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement 
     version: 
     requirements: 
     - - '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.3.1
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   type: :development
   name: hoe
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement 
     version: 
     requirements: 
     - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
+      - !ruby/object:Gem::Version 
+        version: 1.8.2
 description: jetty server for rails applications
 email: 
 - fabio.kung@gmail.com
@@ -127,5 +132,6 @@ extra_rdoc_files:
 - README.txt
 - TODO.txt
 requirements: []
+
 rubyforge_project: jetty-rails
 autorequire: