active_support.rb in activesupport-3.0.pre

- old
+ new
@@ -32,44 +32,10 @@
   on_load_all do
     [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom]
   end
 end
 
-require "active_support/dependencies/autoload"
+require 'active_support/autoload'
+require 'active_support/vendor'
 
-module ActiveSupport
-  extend ActiveSupport::Autoload
-
-  # TODO: Narrow this list down
-  eager_autoload do
-    autoload :BacktraceCleaner
-    autoload :Base64
-    autoload :BasicObject
-    autoload :Benchmarkable
-    autoload :BufferedLogger
-    autoload :Cache
-    autoload :Callbacks
-    autoload :Concern
-    autoload :Configurable
-    autoload :Deprecation
-    autoload :Gzip
-    autoload :Inflector
-    autoload :JSON
-    autoload :Memoizable
-    autoload :MessageEncryptor
-    autoload :MessageVerifier
-    autoload :Multibyte
-    autoload :OptionMerger
-    autoload :OrderedHash
-    autoload :OrderedOptions
-    autoload :Notifications
-    autoload :Rescuable
-    autoload :SecureRandom
-    autoload :StringInquirer
-    autoload :XmlMini
-  end
-
-  autoload :SafeBuffer, "active_support/core_ext/string/output_safety"
-  autoload :TestCase
-end
-
-autoload :I18n, "active_support/i18n"
+require 'i18n'
+I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"