Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb

1 files changed, 27 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
index 7c65f1cdc1..1f215bb6f1 100644
--- a/actionpack/lib/action_controller/new_base.rb
+++ b/actionpack/lib/action_controller/new_base.rb
@@ -1,7 +1,28 @@
 module ActionController
-  autoload :AbstractBase, "action_controller/new_base/base"
-  autoload :HideActions,  "action_controller/new_base/hide_actions"
-  autoload :Layouts,      "action_controller/new_base/layouts"
-  autoload :Renderer,     "action_controller/new_base/renderer"
-  autoload :UrlFor,       "action_controller/new_base/url_for"
-end
\ No newline at end of file
+  autoload :Base,                 "action_controller/new_base/base"
+  autoload :ConditionalGet,       "action_controller/new_base/conditional_get"
+  autoload :HideActions,          "action_controller/new_base/hide_actions"
+  autoload :Http,                 "action_controller/new_base/http"
+  autoload :Layouts,              "action_controller/new_base/layouts"
+  autoload :Rails2Compatibility,  "action_controller/new_base/compatibility"
+  autoload :Redirector,           "action_controller/new_base/redirector"
+  autoload :Renderer,             "action_controller/new_base/renderer"
+  autoload :Testing,              "action_controller/new_base/testing"
+  autoload :UrlFor,               "action_controller/new_base/url_for"
+  
+  # Ported modules
+  # require 'action_controller/routing'
+  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
+  autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
+  autoload :RecordIdentifier,  'action_controller/record_identifier'
+  autoload :Resources,         'action_controller/routing/resources'
+  autoload :SessionManagement, 'action_controller/base/session_management'
+  autoload :TestCase,          'action_controller/testing/test_case'
+  autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
+  autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
+  
+  require 'action_controller/routing'
+end
+
+require 'action_dispatch'
+require 'action_view'
\ No newline at end of file