Revert "Setup explicit requires for files with exceptions. Removed them from autoloading."

Booting a new Rails application does not work after this commit [#5359 state:open]

This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.

3 files changed, 1 insertions, 5 deletions

diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index dd0be4775d..b7befe110d 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -1,9 +1,8 @@
+require 'active_support/core_ext/benchmark'
 require 'net/https'
 require 'date'
 require 'time'
 require 'uri'
-require 'active_support/core_ext/benchmark'
-require 'action_controller/metal/exceptions'
 
 module ActiveResource
   # Class to handle connections to remote web services.
diff --git a/activeresource/lib/active_resource/exceptions.rb b/activeresource/lib/active_resource/exceptions.rb
index 56f8a71702..0f4549fd73 100644
--- a/activeresource/lib/active_resource/exceptions.rb
+++ b/activeresource/lib/active_resource/exceptions.rb
@@ -1,5 +1,3 @@
-require 'action_controller/metal/exceptions'
-
 module ActiveResource
   class ConnectionError < StandardError # :nodoc:
     attr_reader :response
diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index 33fd626d1d..1b4b61899d 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/metal/exceptions'
 
 class ConnectionTest < Test::Unit::TestCase
   ResponseCodeStub = Struct.new(:code)