All libraries should link against the independent active support

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

8 files changed, 6 insertions, 24 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 30245e934a..51db64bf44 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -24,18 +24,10 @@
 $:.unshift(File.dirname(__FILE__))
 
 begin
-  require 'active_support/core_ext'
-  require 'active_support/clean_logger'
-  require 'active_support/misc'
-  require 'active_support/dependencies'
+  require 'active_support'
 rescue LoadError
   require 'rubygems'
   require_gem 'activesupport'
-  
-  require 'active_support/core_ext'
-  require 'active_support/clean_logger'
-  require 'active_support/misc'
-  require 'active_support/dependencies'
 end
 
 require 'action_controller/base'
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 0eea2d02c1..0541413625 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -25,18 +25,10 @@
 $:.unshift(File.dirname(__FILE__))
 
 begin
-  require 'active_support/core_ext'
-  require 'active_support/clean_logger'
-  require 'active_support/misc'
-  require 'active_support/dependencies'
+  require 'active_support'
 rescue LoadError
   require 'rubygems'
   require_gem 'activesupport'
-  
-  require 'active_support/core_ext'
-  require 'active_support/clean_logger'
-  require 'active_support/misc'
-  require 'active_support/dependencies'
 end
 
 require 'active_record/base'
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 6064e18b03..bccc9c3e21 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -30,6 +30,7 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
 
 
 # Require Rails libraries.
+require 'active_support'
 require 'active_record'
 require 'action_controller'
 require 'action_mailer'
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index 948b5e47eb..f58d974cc1 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -25,6 +25,7 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
 
 # Require Rails gems.
 require 'rubygems'
+require_gem 'activesupport'
 require_gem 'activerecord'
 require_gem 'actionpack'
 require_gem 'actionmailer'
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 007b407005..74de93713c 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -24,7 +24,7 @@
 require 'breakpoint'
 
 class Dispatcher
-  class <<self
+  class << self
     def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
       begin
         prepare_application
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index edfe86efc4..3e7f459345 100644
--- a/railties/lib/rails_generator.rb
+++ b/railties/lib/rails_generator.rb
@@ -23,8 +23,7 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'active_support/core_ext'
-
+require 'active_support'
 
 require 'rails_generator/base'
 require 'rails_generator/lookup'
diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb
index 54b4b32fd3..eafc99728c 100644
--- a/railties/lib/rails_generator/base.rb
+++ b/railties/lib/rails_generator/base.rb
@@ -1,5 +1,3 @@
-require 'active_support/class_attribute_accessors'
-require 'active_support/inflector'
 require File.dirname(__FILE__) + '/options'
 require File.dirname(__FILE__) + '/manifest'
 require File.dirname(__FILE__) + '/spec'
diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb
index 80af7fedf9..287605c852 100644
--- a/railties/lib/rails_generator/options.rb
+++ b/railties/lib/rails_generator/options.rb
@@ -1,5 +1,4 @@
 require 'optparse'
-require 'active_support/class_inheritable_attributes'
 
 module Rails
   module Generator