Load generators from both lib/rails/generators and lib/generators. Us…

…ing the former since it's less obstrusive.

activerecord/lib/generators/active_record/migration/migration_generator.rb → activerecord/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

activerecord/lib/generators/active_record/model/model_generator.rb → activerecord/lib/rails/generators/active_record/model/model_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

activerecord/lib/generators/active_record/observer/observer_generator.rb → activerecord/lib/rails/generators/active_record/observer/observer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb → activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators.rb

@@ -242,7 +242,7 @@ def self.lookup(namespaces) #:nodoc:
         paths = namespaces_to_paths(namespaces)
 
         paths.each do |raw_path|
-          ["rails_generators", "generators"].each do |base|
+          ["rails/generators", "generators"].each do |base|
             path = "#{base}/#{raw_path}_generator"
 
             begin
@@ -265,7 +265,7 @@ def self.lookup! #:nodoc:
         load_generators_from_railties!
 
         $LOAD_PATH.each do |base|
-          Dir[File.join(base, "{generators,rails_generators}", "**", "*_generator.rb")].each do |path|
+          Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path|
             begin
               require path
             rescue Exception => e

railties/lib/rails/generators/base.rb

@@ -25,7 +25,7 @@ class Base < Thor::Group
       def self.source_root
         @_rails_source_root ||= begin
           if base_name && generator_name
-            File.expand_path(File.join("../../generators", base_name, generator_name, 'templates'), File.dirname(__FILE__))
+            File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
           end
         end
       end

railties/lib/generators/erb/controller/controller_generator.rb → railties/lib/rails/generators/erb/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators

railties/lib/generators/erb/mailer/mailer_generator.rb → railties/lib/rails/generators/erb/mailer/mailer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb/controller/controller_generator'
+require 'rails/generators/erb/controller/controller_generator'
 
 module Erb
   module Generators

railties/lib/generators/erb/scaffold/scaffold_generator.rb → railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 require 'rails/generators/resource_helpers'
 
 module Erb

railties/lib/generators/rails/app/app_generator.rb → railties/lib/rails/generators/rails/app/app_generator.rb

@@ -5,7 +5,7 @@
 module Rails::Generators
   # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
   # can change in Ruby 1.8.7 when we FileUtils.cd.
-  RAILS_DEV_PATH = File.expand_path("../../../../..", File.dirname(__FILE__))
+  RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
 
   RESERVED_NAMES = %w[generate console server dbconsole
                       application destroy benchmarker profiler

railties/lib/generators/rails/plugin/plugin_generator.rb → railties/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
 
 module Rails
   module Generators

railties/lib/generators/rails/resource/resource_generator.rb → railties/lib/rails/generators/rails/resource/resource_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators/resource_helpers'
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
 
 module Rails
   module Generators

railties/lib/generators/rails/scaffold/scaffold_generator.rb → railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
 
 module Rails
   module Generators

railties/lib/generators/test_unit/controller/controller_generator.rb → railties/lib/rails/generators/test_unit/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/helper/helper_generator.rb → railties/lib/rails/generators/test_unit/helper/helper_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/integration/integration_generator.rb → railties/lib/rails/generators/test_unit/integration/integration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/mailer/mailer_generator.rb → railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/model/model_generator.rb → railties/lib/rails/generators/test_unit/model/model_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/observer/observer_generator.rb → railties/lib/rails/generators/test_unit/observer/observer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/performance/performance_generator.rb → railties/lib/rails/generators/test_unit/performance/performance_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/plugin/plugin_generator.rb → railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

railties/lib/generators/test_unit/scaffold/scaffold_generator.rb → railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 require 'rails/generators/resource_helpers'
 
 module TestUnit

railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/test/generators/actions_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/app/app_generator'
+require 'rails/generators/rails/app/app_generator'
 
 class ActionsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/app_generator_test.rb

@@ -1,6 +1,6 @@
 require 'abstract_unit'
 require 'generators/generators_test_helper'
-require 'generators/rails/app/app_generator'
+require 'rails/generators/rails/app/app_generator'
 
 class AppGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/controller_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/controller/controller_generator'
+require 'rails/generators/rails/controller/controller_generator'
 
 class ControllerGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/generator_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
 
 class GeneratorGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/generators_test_helper.rb

@@ -28,7 +28,7 @@ def self.included(base)
   end
 
   def copy_routes
-    routes = File.expand_path("../../../lib/generators/rails/app/templates/config/routes.rb", __FILE__)
+    routes = File.expand_path("../../../lib/rails/generators/rails/app/templates/config/routes.rb", __FILE__)
     destination = File.join(destination_root, "config")
     FileUtils.mkdir_p(destination)
     FileUtils.cp File.expand_path(routes), destination

railties/test/generators/helper_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/helper/helper_generator'
+require 'rails/generators/rails/helper/helper_generator'
 
 ObjectHelper = Class.new
 AnotherObjectHelperTest = Class.new

railties/test/generators/integration_test_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/integration_test/integration_test_generator'
+require 'rails/generators/rails/integration_test/integration_test_generator'
 
 class IntegrationTestGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/mailer_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/mailer/mailer_generator'
+require 'rails/generators/rails/mailer/mailer_generator'
 
 class MailerGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/metal_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/metal/metal_generator'
+require 'rails/generators/rails/metal/metal_generator'
 
 class MetalGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/migration_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/migration/migration_generator'
+require 'rails/generators/rails/migration/migration_generator'
 
 class MigrationGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/model_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
 
 class ModelGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/named_base_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 # Mock out what we need from AR::Base.
 module ActiveRecord

railties/test/generators/observer_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/observer/observer_generator'
+require 'rails/generators/rails/observer/observer_generator'
 
 class ObserverGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/performance_test_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/performance_test/performance_test_generator'
+require 'rails/generators/rails/performance_test/performance_test_generator'
 
 class PerformanceTestGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/plugin_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/plugin/plugin_generator'
+require 'rails/generators/rails/plugin/plugin_generator'
 
 class PluginGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/resource_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
 
 class ResourceGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/scaffold_controller_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Unknown
   module Generators

railties/test/generators/scaffold_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/scaffold/scaffold_generator'
+require 'rails/generators/rails/scaffold/scaffold_generator'
 
 class ScaffoldGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/session_migration_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/session_migration/session_migration_generator'
+require 'rails/generators/rails/session_migration/session_migration_generator'
 
 class SessionMigrationGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators/stylesheets_generator_test.rb

@@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/stylesheets/stylesheets_generator'
+require 'rails/generators/rails/stylesheets/stylesheets_generator'
 
 class StylesheetsGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper

railties/test/generators_test.rb

@@ -1,6 +1,6 @@
 require 'generators/generators_test_helper'
-require 'generators/rails/model/model_generator'
-require 'generators/test_unit/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
+require 'rails/generators/test_unit/model/model_generator'
 require 'mocha'
 
 class GeneratorsTest < Rails::Generators::TestCase