From 29158d4158e9ae800c5be31a796940888bd03cc5 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 15:09:15 -0800
Subject: Remove a failed attempt at refactoring AC configuration

---
 actionpack/lib/action_controller.rb                |  1 -
 actionpack/lib/action_controller/base.rb           |  1 -
 .../lib/action_controller/metal/configuration.rb   | 28 ----------------------
 .../action_controller/metal/session_management.rb  |  2 --
 4 files changed, 32 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/metal/configuration.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index a449a3364c..3b97f38498 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -13,7 +13,6 @@ module ActionController
   autoload_under "metal" do
     autoload :Compatibility
     autoload :ConditionalGet
-    autoload :Configuration
     autoload :Cookies
     autoload :Flash
     autoload :Head
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index aec14165b6..ace0276a31 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -15,7 +15,6 @@ module ActionController
     include ActionController::Renderers::All
     include ActionController::ConditionalGet
     include ActionController::RackDelegation
-    include ActionController::Configuration
 
     # Legacy modules
     include SessionManagement
diff --git a/actionpack/lib/action_controller/metal/configuration.rb b/actionpack/lib/action_controller/metal/configuration.rb
deleted file mode 100644
index 5c829853b7..0000000000
--- a/actionpack/lib/action_controller/metal/configuration.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module ActionController
-  module Configuration
-    extend ActiveSupport::Concern
-    
-    def config
-      @config ||= self.class.config
-    end
-    
-    def config=(config)
-      @config = config
-    end
-    
-    module ClassMethods
-      def default_config
-        @default_config ||= {}
-      end
-      
-      def config
-        self.config ||= default_config
-      end
-      
-      def config=(config)
-        @config = ActiveSupport::OrderedHash.new
-        @config.merge!(config)
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb
index d70f40ce7a..6997257844 100644
--- a/actionpack/lib/action_controller/metal/session_management.rb
+++ b/actionpack/lib/action_controller/metal/session_management.rb
@@ -2,8 +2,6 @@ module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     extend ActiveSupport::Concern
 
-    include ActionController::Configuration
-
     module ClassMethods
       # Set the session store to be used for keeping the session data between requests.
       # By default, sessions are stored in browser cookies (<tt>:cookie_store</tt>),
-- 
cgit v1.2.3