1 files changed, 5 insertions, 22 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index a30f3b94d7..cfcd46d985 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -13,13 +13,6 @@ module ActionController #:nodoc:
   end
   class MissingTemplate < ActionControllerError #:nodoc:
   end
-  class RoutingError < ActionControllerError
-    attr_reader :failures
-    def initialize(message, failures=[])
-      super(message)
-      @failures = failures
-    end
-  end
   class UnknownAction < ActionControllerError #:nodoc:
   end
   class MissingFile < ActionControllerError #:nodoc:
@@ -212,12 +205,6 @@ module ActionController #:nodoc:
     # should instead be implemented in the controller to determine when debugging screens should be shown.
     @@consider_all_requests_local = true
     cattr_accessor :consider_all_requests_local
-    
-    # Enable or disable the collection of failure information for RoutingErrors.
-    # This information can be extremely useful when tweaking custom routes, but is
-    # pointless once routes have been tested and verified.
-    @@debug_routes = true
-    cattr_accessor :debug_routes
 
     # Template root determines the base from which template references will be made. So a call to render("test/template")
     # will be converted to "#{template_root}/test/template.rhtml".
@@ -274,14 +261,6 @@ module ActionController #:nodoc:
       def controller_name
         Inflector.underscore(controller_class_name.sub(/Controller/, ""))
       end
-      
-      # Convert the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
-      def controller_path
-        components = self.name.to_s.split('::').collect { |name| name.underscore }
-        components[-1] = $1 if /^(.*)_controller$/ =~ components[-1]
-        components.shift if components.first == 'controllers' # Transitional conditional to accomodate root Controllers module
-        components.join('/')
-      end
     end
 
     public
@@ -358,6 +337,10 @@ module ActionController #:nodoc:
         end
       end
 
+      def module_name
+        @params["module"]
+      end
+
       # Converts the class name from something like "OneModule::TwoModule::NeatController" to "NeatController".
       def controller_class_name
         self.class.controller_class_name
@@ -708,7 +691,7 @@ module ActionController #:nodoc:
       end
 
       def default_template_name(default_action_name = action_name)
-        "#{self.class.controller_path}/#{default_action_name}"
+        module_name ? "#{module_name}/#{controller_name}/#{default_action_name}" : "#{controller_name}/#{default_action_name}"
       end
   end
 end