From 859c89ccb6afb0759eafc1c6eb5d556d83eb17f7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 28 Nov 2008 18:51:08 +0000 Subject: [PATCH] Dependencies moved to ActiveSupport::Dependencies git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/work@2065 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- rails-2.2/config/environment.rb | 2 +- rails-2.2/vendor/plugins/actionwebservice/init.rb | 2 +- rails-2.2/vendor/plugins/classic_pagination/test/helper.rb | 2 +- .../engines/lib/engines/rails_extensions/dependencies.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rails-2.2/config/environment.rb b/rails-2.2/config/environment.rb index 9a3bf4b1d..84e59f91b 100644 --- a/rails-2.2/config/environment.rb +++ b/rails-2.2/config/environment.rb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') diff --git a/rails-2.2/vendor/plugins/actionwebservice/init.rb b/rails-2.2/vendor/plugins/actionwebservice/init.rb index ade118c0f..32d6ea11a 100644 --- a/rails-2.2/vendor/plugins/actionwebservice/init.rb +++ b/rails-2.2/vendor/plugins/actionwebservice/init.rb @@ -1,7 +1,7 @@ require 'action_web_service' # These need to be in the load path for action_web_service to work -Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"] +ActiveSupport::Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"] # AWS Test helpers require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/ diff --git a/rails-2.2/vendor/plugins/classic_pagination/test/helper.rb b/rails-2.2/vendor/plugins/classic_pagination/test/helper.rb index 3f76d5a76..31cc2181c 100644 --- a/rails-2.2/vendor/plugins/classic_pagination/test/helper.rb +++ b/rails-2.2/vendor/plugins/classic_pagination/test/helper.rb @@ -26,7 +26,7 @@ unless defined?(ActiveRecord) %w(action_pack active_record action_controller active_record/fixtures action_controller/test_process).each {|f| require f} - Dependencies.load_paths.unshift "#{plugin_root}/lib" + ActiveSupport::Dependencies.load_paths.unshift "#{plugin_root}/lib" end # Define the connector diff --git a/rails-2.2/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb b/rails-2.2/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb index 82ecaa880..05ba0eb58 100644 --- a/rails-2.2/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb +++ b/rails-2.2/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb @@ -140,4 +140,4 @@ module Engines::RailsExtensions::Dependencies end end -Dependencies.send :include, Engines::RailsExtensions::Dependencies +ActiveSupport::Dependencies.send :include, Engines::RailsExtensions::Dependencies