Use ActionDispatch::Routing everywhere

5 files changed, 10 insertions, 10 deletions

diff --git a/railties/builtin/routes.rb b/railties/builtin/routes.rb
index ef9d9e756d..b4fdb95a64 100644
--- a/railties/builtin/routes.rb
+++ b/railties/builtin/routes.rb
@@ -1,3 +1,3 @@
-ActionController::Routing::Routes.draw do |map|
+ActionDispatch::Routing::Routes.draw do |map|
   match '/rails/info/properties' => "rails/info#properties"
-end
\ No newline at end of file
+end
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index b3a57e2ced..67094392ee 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -48,7 +48,7 @@ module Rails
     end
 
     def routes
-      ::ActionController::Routing::Routes
+      ::ActionDispatch::Routing::Routes
     end
 
     def railties
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index ac0f440896..1d0ac38c96 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,9 +1,9 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
   Rails::Application.reload_routes!
-  all_routes = ENV['CONTROLLER'] ? ActionController::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionController::Routing::Routes.routes
+  all_routes = ENV['CONTROLLER'] ? ActionDispatch::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionDispatch::Routing::Routes.routes
   routes = all_routes.collect do |route|
-    name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
+    name = ActionDispatch::Routing::Routes.named_routes.routes.index(route).to_s
     reqs = route.requirements.empty? ? "" : route.requirements.inspect
     {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 4163fb2c6d..9cfa1d6aaa 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -14,7 +14,7 @@ class InfoControllerTest < ActionController::TestCase
   tests Rails::InfoController
 
   def setup
-    ActionController::Routing::Routes.draw do |map|
+    ActionDispatch::Routing::Routes.draw do |map|
       match ':controller/:action'
     end
     @controller.stubs(:consider_all_requests_local? => false, :local_request? => true)
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index d51a0d153c..c9e6e6081a 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -133,7 +133,7 @@ module RailtiesTest
           end
         end
 
-        ActionController::Routing::Routes.draw do
+        ActionDispatch::Routing::Routes.draw do
           match "/sprokkit", :to => Sprokkit
         end
       RUBY
@@ -170,7 +170,7 @@ module RailtiesTest
       RUBY
 
       @plugin.write "config/routes.rb", <<-RUBY
-        ActionController::Routing::Routes.draw do |map|
+        ActionDispatch::Routing::Routes.draw do |map|
           match 'foo', :to => 'bar#index'
           match 'bar', :to => 'bar#index'
         end
@@ -261,7 +261,7 @@ YAML
 
     def test_namespaced_controllers_with_namespaced_routes
       @plugin.write "config/routes.rb", <<-RUBY
-        ActionController::Routing::Routes.draw do
+        ActionDispatch::Routing::Routes.draw do
           namespace :admin do
             match "index", :to => "admin/foo#index"
           end
@@ -312,4 +312,4 @@ YAML
       boot_rails
     end
   end
-end
\ No newline at end of file
+end