Missed Reloadable bits and pieces

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7475 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

5 files changed, 2 insertions, 21 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 64780cefc2..7d372cf250 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -612,10 +612,6 @@ module ActionController #:nodoc:
       class Sweeper < ActiveRecord::Observer #:nodoc:
         attr_accessor :controller
 
-        # ActiveRecord::Observer will mark this class as reloadable even though it should not be.
-        # However, subclasses of ActionController::Caching::Sweeper should be Reloadable
-        include Reloadable::Deprecated
-        
         def before(controller)
           self.controller = controller
           callback(:before)
diff --git a/actionwebservice/lib/action_web_service/api.rb b/actionwebservice/lib/action_web_service/api.rb
index ccc4b7d656..d16dc420d3 100644
--- a/actionwebservice/lib/action_web_service/api.rb
+++ b/actionwebservice/lib/action_web_service/api.rb
@@ -14,10 +14,6 @@ module ActionWebService # :nodoc:
     # See ActionWebService::Container::Direct::ClassMethods for an example
     # of use.
     class Base
-      # Action WebService API subclasses should be reloaded by the dispatcher in Rails
-      # when Dependencies.mechanism = :load.
-      include Reloadable::Deprecated
-      
       # Whether to transform the public API method names into camel-cased names 
       class_inheritable_option :inflect_names, true
 
diff --git a/actionwebservice/lib/action_web_service/base.rb b/actionwebservice/lib/action_web_service/base.rb
index b409377b6a..6282061d87 100644
--- a/actionwebservice/lib/action_web_service/base.rb
+++ b/actionwebservice/lib/action_web_service/base.rb
@@ -31,10 +31,6 @@ module ActionWebService # :nodoc:
   #     member :email,     :string
   #   end
   class Base
-    # Action WebService subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-    include Reloadable::Deprecated
-
     # Whether to report exceptions back to the caller in the protocol's exception
     # format
     class_inheritable_option :web_service_exception_reporting, true
diff --git a/actionwebservice/lib/action_web_service/struct.rb b/actionwebservice/lib/action_web_service/struct.rb
index af93f65a4e..00eafc169f 100644
--- a/actionwebservice/lib/action_web_service/struct.rb
+++ b/actionwebservice/lib/action_web_service/struct.rb
@@ -19,10 +19,6 @@ module ActionWebService
   # Active Record model classes are already implicitly supported in method
   # signatures.
   class Struct
-    # Action WebService Struct subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-    include Reloadable::Deprecated
-    
     # If a Hash is given as argument to an ActionWebService::Struct constructor,
     # it can contain initial values for the structure member.
     def initialize(values={})
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 735d8f5c87..cb1289957e 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -55,13 +55,10 @@ class Dispatcher
       ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
 
       Dependencies.clear
-      ActiveSupport::Deprecation.silence do # TODO: Remove after 1.2
-        Class.remove_class(*Reloadable.reloadable_classes)
-      end
-        
+
       ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
     end
-    
+
     # Add a preparation callback. Preparation callbacks are run before every
     # request in development mode, and before the first request in production
     # mode.