Extract dynamic scaffolding into a plugin. Closes #7700.

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

3 files changed, 4 insertions, 2 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index cb2587b235..c10cd113bd 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Extract dynamic scaffolding into a plugin.  #7700 [Josh Peek]
+
 * Added user/password options for url_for to add http authentication in a URL [DHH]
 
 * Fixed that FormTagHelper#text_area_tag should disregard :size option if it's not a string [Brendon Davidson]
diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb
index 11ece16f0e..327e8b0912 100644
--- a/actionpack/lib/action_controller/scaffolding.rb
+++ b/actionpack/lib/action_controller/scaffolding.rb
@@ -184,6 +184,8 @@ module ActionController
             end
         end_eval
       end
+
+      deprecate :scaffold => 'Controller scaffolding will be moved to a plugin in Rails 2.0. Switch to the generator or `script/plugin install scaffolding`'
     end
   end
 end
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index 6c5424a5b6..d1e9122dc9 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -16,8 +16,6 @@ class Address
 end
 
 class AddressesTestController < ActionController::Base
-  scaffold :address
-
   def self.controller_name; "addresses"; end
   def self.controller_path; "addresses"; end
 end