Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ module JRubyJars
end
require jruby_rack_jar_path if defined?(JRUBY_VERSION)
end
require 'jruby/rack/version' # @deprecated to be removed in 1.2
}
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Rails 3.x specific booter behavior.
# @see JRuby::Rack::Railtie
module JRuby::Rack::RailsBooter::Rails3Environment
module JRuby::Rack::RailsBooter::RailsEnvironment

# @return [Rails::Application] the (loaded) application instance
def to_app
Expand All @@ -23,7 +23,7 @@ def load_environment
require expand_path('config/boot.rb')
require 'jruby/rack/rails/railtie'
require expand_path('config/environment.rb')
require 'jruby/rack/rails/extensions3'
require 'jruby/rack/rails/extensions'
end

protected
Expand Down
141 changes: 0 additions & 141 deletions src/main/ruby/jruby/rack/rails/environment2.rb

This file was deleted.

62 changes: 0 additions & 62 deletions src/main/ruby/jruby/rack/rails/extensions2.rb

This file was deleted.

8 changes: 0 additions & 8 deletions src/main/ruby/jruby/rack/rails/extensions3.rb

This file was deleted.

15 changes: 2 additions & 13 deletions src/main/ruby/jruby/rack/rails_booter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@ def boot!
ENV['RAILS_ROOT'] = app_path
ENV['RAILS_ENV'] = rails_env

if rails2?
require 'jruby/rack/rails/environment2'
extend Rails2Environment
else
require 'jruby/rack/rails/environment3'
extend Rails3Environment
end
require 'jruby/rack/rails/environment'
extend RailsEnvironment

set_public_root
self
Expand Down Expand Up @@ -71,11 +66,6 @@ def run_boot_hooks

private

def rails2?
app_path = real_path File.join(layout.app_uri, 'config/application.rb')
! ( app_path && File.exist?(app_path) )
end

class << self

# @see #RailsRackApplicationFactory
Expand All @@ -96,6 +86,5 @@ def rails_booter
end

end

end
end
Loading