Permalink
Browse files

Missed Reloadable bits and pieces

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7475 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 041b9b8 commit 15f7f1a38041c0b3355f2a323f785465b44029f9 @jeremy jeremy committed Sep 14, 2007
@@ -612,10 +612,6 @@ def cache_sweeper(*sweepers)
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)
@@ -14,10 +14,6 @@ module API # :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
@@ -31,10 +31,6 @@ class ActionWebServiceError < StandardError # :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
@@ -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={})
@@ -55,13 +55,10 @@ def reset_application!
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.

0 comments on commit 15f7f1a

Please sign in to comment.