Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

2 files changed, 0 insertions, 42 deletions

diff --git a/railties/lib/generators/rails/scaffold/USAGE b/railties/lib/generators/rails/scaffold/USAGE
deleted file mode 100644
index be1d113ed8..0000000000
--- a/railties/lib/generators/rails/scaffold/USAGE
+++ /dev/null
@@ -1,29 +0,0 @@
-Description:
-    Scaffolds an entire resource, from model and migration to controller and
-    views, along with a full test suite. The resource is ready to use as a
-    starting point for your RESTful, resource-oriented application.
-
-    Pass the name of the model (in singular form), either CamelCased or
-    under_scored, as the first argument, and an optional list of attribute
-    pairs.
-
-    Attribute pairs are field:type arguments specifying the
-    model's attributes. Timestamps are added by default, so you don't have to
-    specify them by hand as 'created_at:datetime updated_at:datetime'.
-
-    You don't have to think up every attribute up front, but it helps to
-    sketch out a few so you can start working with the resource immediately.
-
-    For example, 'scaffold post title:string body:text published:boolean'
-    gives you a model with those three attributes, a controller that handles
-    the create/show/update/destroy, forms to create and edit your posts, and
-    an index that lists them all, as well as a resources :posts
-    declaration in config/routes.rb.
-
-    If you want to remove all the generated files, run
-    'rails destroy scaffold ModelName'.
-
-Examples:
-    `rails generate scaffold post`
-    `rails generate scaffold post title:string body:text published:boolean`
-    `rails generate scaffold purchase order_id:integer amount:decimal`
diff --git a/railties/lib/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/generators/rails/scaffold/scaffold_generator.rb
deleted file mode 100644
index fdea5bf52b..0000000000
--- a/railties/lib/generators/rails/scaffold/scaffold_generator.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'generators/rails/resource/resource_generator'
-
-module Rails
-  module Generators
-    class ScaffoldGenerator < ResourceGenerator #metagenerator
-      remove_hook_for :resource_controller
-      remove_class_option :actions
-
-      hook_for :scaffold_controller, :required => true
-      hook_for :stylesheets
-    end
-  end
-end