Move Controllers wrapper module away from environment.rb and into dependencies.rb

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 6 insertions, 5 deletions

diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index bccc9c3e21..2d37714831 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -41,8 +41,6 @@ require_dependency "environments/#{RAILS_ENV}"
 ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
 ActiveRecord::Base.establish_connection
 
-Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')))
-
 
 # Configure defaults if the included environment did not.
 begin
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index f58d974cc1..057f664396 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -37,8 +37,6 @@ require_dependency "environments/#{RAILS_ENV}"
 ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
 ActiveRecord::Base.establish_connection
 
-Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')))
-
 
 # Configure defaults if the included environment did not.
 begin
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index 3e7f459345..8268f3f5f0 100644
--- a/railties/lib/rails_generator.rb
+++ b/railties/lib/rails_generator.rb
@@ -23,7 +23,12 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'active_support'
+begin
+  require 'active_support'
+rescue LoadError
+  require 'rubygems'
+  require_gem 'activesupport'
+end
 
 require 'rails_generator/base'
 require 'rails_generator/lookup'