Move AbstractController to a top-level component

14 files changed, 19 insertions, 22 deletions

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
new file mode 100644
index 0000000000..f020abaa45
--- /dev/null
+++ b/actionpack/lib/abstract_controller.rb
@@ -0,0 +1,16 @@
+require "active_support/core_ext/module/attr_internal"
+require "active_support/core_ext/module/delegation"
+
+module AbstractController
+  autoload :Base,               "abstract_controller/base"
+  autoload :Benchmarker,        "abstract_controller/benchmarker"
+  autoload :Callbacks,          "abstract_controller/callbacks"
+  autoload :Helpers,            "abstract_controller/helpers"
+  autoload :Layouts,            "abstract_controller/layouts"
+  autoload :Logger,             "abstract_controller/logger"
+  autoload :Renderer,           "abstract_controller/renderer"
+  # === Exceptions
+  autoload :ActionNotFound,     "abstract_controller/exceptions"
+  autoload :DoubleRenderError,  "abstract_controller/exceptions"
+  autoload :Error,              "abstract_controller/exceptions"
+end
diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/abstract_controller/base.rb
index b93e6ce634..b93e6ce634 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
diff --git a/actionpack/lib/action_controller/abstract/benchmarker.rb b/actionpack/lib/abstract_controller/benchmarker.rb
index 58e9564c2f..58e9564c2f 100644
--- a/actionpack/lib/action_controller/abstract/benchmarker.rb
+++ b/actionpack/lib/abstract_controller/benchmarker.rb
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index ea4b59466e..ea4b59466e 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
diff --git a/actionpack/lib/action_controller/abstract/exceptions.rb b/actionpack/lib/abstract_controller/exceptions.rb
index b671516de1..b671516de1 100644
--- a/actionpack/lib/action_controller/abstract/exceptions.rb
+++ b/actionpack/lib/abstract_controller/exceptions.rb
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 5efa37fde3..5efa37fde3 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index f021dd8b62..f021dd8b62 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index fd33bd2ddd..fd33bd2ddd 100644
--- a/actionpack/lib/action_controller/abstract/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/abstract_controller/renderer.rb
index fe556281ab..4e368a099a 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/abstract_controller/renderer.rb
@@ -1,4 +1,4 @@
-require "action_controller/abstract/logger"
+require "abstract_controller/logger"
 
 module AbstractController
   module Renderer
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 2b2c7ef725..22c2c4f499 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -56,7 +56,7 @@ module ActionController
 end
 
 autoload :HTML, 'action_controller/vendor/html-scanner'
-autoload :AbstractController, 'action_controller/abstract'
+autoload :AbstractController, 'abstract_controller'
 
 autoload :Rack,                       'action_dispatch'
 autoload :ActionDispatch,             'action_dispatch'
diff --git a/actionpack/lib/action_controller/abstract.rb b/actionpack/lib/action_controller/abstract.rb
deleted file mode 100644
index d0eba253b8..0000000000
--- a/actionpack/lib/action_controller/abstract.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require "active_support/core_ext/module/attr_internal"
-require "active_support/core_ext/module/delegation"
-
-module AbstractController
-  autoload :Base,               "action_controller/abstract/base"
-  autoload :Benchmarker,        "action_controller/abstract/benchmarker"
-  autoload :Callbacks,          "action_controller/abstract/callbacks"
-  autoload :Helpers,            "action_controller/abstract/helpers"
-  autoload :Layouts,            "action_controller/abstract/layouts"
-  autoload :Logger,             "action_controller/abstract/logger"
-  autoload :Renderer,           "action_controller/abstract/renderer"
-  # === Exceptions
-  autoload :ActionNotFound,     "action_controller/abstract/exceptions"
-  autoload :DoubleRenderError,  "action_controller/abstract/exceptions"
-  autoload :Error,              "action_controller/abstract/exceptions"
-end
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 82d05414b9..5333ca497c 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -1,5 +1,3 @@
-require 'action_controller/abstract'
-
 module ActionController
   # ActionController::Metal provides a way to get a valid Rack application from a controller.
   #
diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb
index 915054f7fb..ba4302d914 100644
--- a/actionpack/test/abstract_controller/test_helper.rb
+++ b/actionpack/test/abstract_controller/test_helper.rb
@@ -6,7 +6,7 @@ require 'rubygems'
 require 'test/unit'
 require 'active_support'
 require 'active_support/test_case'
-require 'action_controller/abstract'
+require 'abstract_controller'
 require 'action_view'
 require 'action_view/base'
 require 'action_dispatch'
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 7f373ea7c5..b062a71442 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -13,7 +13,6 @@ require 'test/unit'
 require 'active_support'
 
 require 'active_support/test_case'
-require 'action_controller/abstract'
 require 'action_controller'
 require 'fixture_template'
 require 'action_controller/testing/process'