Some railties cleanup:

	* Rename <framework>/rails.rb -> <framework>/railtie.rb
	* Rails::Plugin -> Rails::Railtie
	* Rails::Plugin::Vendored -> Rails::Plugin

1 files changed, 4 insertions, 4 deletions

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index adb11e8257..f0a0d5e55e 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -3,7 +3,7 @@ require 'active_support/ordered_options'
 module Rails
   # Temporarily separate the plugin configuration class from the main
   # configuration class while this bit is being cleaned up.
-  class Plugin::Configuration
+  class Railtie::Configuration
 
     def self.default
       @default ||= new
@@ -45,12 +45,12 @@ module Rails
     end
 
     def config_keys
-      ([ :active_support, :action_view, :action_mailer, :active_resource ] +
-        Plugin.plugin_names).map { |n| n.to_s }.uniq
+      ([ :active_support, :action_view ] +
+        Railtie.plugin_names).map { |n| n.to_s }.uniq
     end
   end
 
-  class Configuration < Plugin::Configuration
+  class Configuration < Railtie::Configuration
     attr_accessor :after_initialize_blocks, :cache_classes,
                   :consider_all_requests_local, :dependency_loading, :gems,
                   :load_once_paths, :logger, :metals, :plugins,