jruby-rack 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,19 @@
+== 1.0.4
+
+- Make sane defaults for app/gem/public paths when using
+  RailsFilesystemLayout (Kristian Meier)
+- Add 'jruby.rack.slash.index' init param that forces / =>
+  /index.html. Fixes JRUBY_RACK-35 and makes Jetty 6 work without
+  having to configure dirAllowed in Jetty's default servlet.
+- Switch to mostly relying on request URI and not so much servlet
+  path/path info. Makes Tomcat 7 work.
+- Added rails.relative_url_append context parameter. This can be set in
+  your web.xml or similar to append a string to the end of the context
+  path when the RAILS_RELATIVE_URL_ROOT is set. This allows you to
+  host your rails app in a location other than the base context path
+  of your application. (Ben Rosenblum)
+- Don't use toURI, following changes in JRuby 1.5.6.
+
 == 1.0.3
 
 - JRUBY-4892: Fix IO collapsing \r\n to \n on Windows

data/README.md

@@ -1,7 +1,5 @@
 # JRuby-Rack
 
-- http://jruby-rack.kenai.com/
-
 JRuby-Rack is a lightweight adapter for the Java servlet environment
 that allows any Rack-based application to run unmodified in a Java
 servlet container. JRuby-Rack supports Rails, Merb, as well as any
@@ -12,13 +10,19 @@ For more information on Rack, visit http://rack.rubyforge.org.
 # Getting Started
 
 The easiest way to use JRuby-Rack is to get [Warbler][1]. Warbler
-bundles the latest version of JRuby-Rack and ensures it gets placed in
+depends on the latest version of JRuby-Rack and ensures it gets placed in
 your WAR file when it gets built.
 
-If you're assembling your own WAR using other means, you'll need to
-drop the [latest JRuby-Rack jar][2] into the WEB-INF/lib directory and
-configure the RackFilter in your application's web.xml. Example
-web.xml snippets are as follows.
+If you're assembling your own WAR using other means, you can install the
+`jruby-rack` gem. It provides a method to located the jruby-rack jar file:
+
+    require 'fileutils'
+    require 'jruby-rack'
+    FileUtils.cp JRubyJars.jruby_rack_jar_path, '.'
+
+Otherwise you'll need to download the [latest JRuby-Rack jar][2], drop
+it into the WEB-INF/lib directory and configure the RackFilter in your
+application's web.xml. Example web.xml snippets are as follows.
 
 ## For Rails
 
@@ -157,8 +161,37 @@ web.xml.
   Merb application files. Defaults to `/WEB-INF`.
 - `rails.env`: Specify the Rails environment to run. Defaults
   to 'production'.
+- `rails.relative_url_append`: Specify a path to be appended to the 
+  ActionController::Base.relative_url_root after the context path. Useful
+  for running a rails app from the same war as an existing app, under
+  a sub-path of the main servlet context root.
 - `merb.environment`: Specify the merb environment to run. Defaults to
   `production`.
+- `jruby.rack.logging`: Specify the logging device to use. Defaults to
+  `servlet_context`. See below.
+- `jruby.rack.slash.index`: Force rewriting of requests that end in
+  '/' to be passed through to the container as '/index.html'. Default
+  is false, but is turned on for Jetty by default to avoid triggering
+  directory index pages.
+
+## Logging
+
+JRuby-Rack sets up a delegate logger for Rails that sends logging
+output to `javax.servlet.ServletContext#log` by default. If you wish
+to use a different logging system, set the `jruby.rack.logging`
+context parameter as follows:
+
+- `servlet_context` (default): Sends log messages to the servlet
+  context.
+- `stdout`: Sends log messages to the standard output stream
+  `System.out`.
+- `commons_logging`: Sends log messages to Apache commons-logging. You
+  still need to configure commons-logging with additional details.
+- `slf4j`: Sends log messages to SLF4J. Again, SLF4J configuration is
+  left up to you.
+
+For those loggers that require a specific named logger, set it in the
+`jruby.rack.logging.name` context parameter.
 
 # Building
 
@@ -276,5 +309,5 @@ The war should be ready to deploy to your Java application server.
 - Chris Neukirchen, for Rack
 - Sun Microsystems, for early project support
 
-[1]: http://warbler.kenai.com/pages/Home
+[1]: http://caldersphere.rubyforge.org/warbler
 [2]: http://repository.codehaus.org/org/jruby/rack/jruby-rack/

data/lib/jruby-rack.rb

@@ -3,4 +3,5 @@ module JRubyJars
   def self.jruby_rack_jar_path
     File.expand_path("../jruby-rack-#{JRuby::Rack::VERSION}.jar", __FILE__)
   end
+  require jruby_rack_jar_path
 end

data/lib/jruby/rack/version.rb

@@ -7,6 +7,6 @@
 
 module JRuby
   module Rack
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 3
-  version: 1.0.3
+    - 4
+  version: 1.0.4
 platform: ruby
 authors: 
   - Nick Sieger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -05:00
+date: 2010-12-08 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -28,12 +28,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - ./History.txt
-  - ./LICENSE.txt
-  - ./README.md
-  - ./lib/jruby-rack-1.0.3.jar
-  - ./lib/jruby-rack.rb
-  - ./lib/jruby/rack/version.rb
+  - History.txt
+  - LICENSE.txt
+  - README.md
+  - lib/jruby-rack-1.0.4.jar
+  - lib/jruby-rack.rb
+  - lib/jruby/rack/version.rb
 has_rdoc: true
 homepage: http://jruby.org
 licenses: []