Add reloadable specific for engines and move environment to application paths.

Signed-off-by: Carl Lerche <carllerche@mac.com>

4 files changed, 11 insertions, 7 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index aaf18b5f51..31787b5cc9 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -8,14 +8,16 @@ module Rails
       attr_accessor :cache_classes, :cache_store, :colorize_logging,
                     :consider_all_requests_local, :dependency_loading,
                     :filter_parameters,  :log_level, :logger, :metals,
-                    :plugins, :preload_frameworks, :reload_plugins,
+                    :plugins, :preload_frameworks, :reload_engines, :reload_plugins,
                     :serve_static_assets, :time_zone, :whiny_nils
 
       def initialize(*)
         super
+        @colorize_logging    = true
         @filter_parameters   = []
         @dependency_loading  = true
         @serve_static_assets = true
+        @time_zone           = "UTC"
       end
 
       def paths
@@ -23,6 +25,7 @@ module Rails
           paths = super
           paths.app.controllers << builtin_controller if builtin_controller
           paths.config.database    "config/database.yml"
+          paths.config.environment "config/environments", :glob => "#{Rails.env}.rb"
           paths.log                "log/#{Rails.env}.log"
           paths.tmp                "tmp"
           paths.tmp.cache          "tmp/cache"
@@ -76,10 +79,6 @@ module Rails
       def log_level
         @log_level ||= Rails.env.production? ? :info : :debug
       end
-
-      def time_zone
-        @time_zone ||= "UTC"
-      end
     end
   end
 end
\ No newline at end of file
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index b98393c01a..33d62c8155 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -124,7 +124,7 @@ module Rails
   protected
 
     def reloadable?(app)
-      app.config.reload_plugins
+      app.config.reload_engines
     end
   end
 end
\ No newline at end of file
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index c4e34b11b8..7d6de91430 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -22,7 +22,6 @@ module Rails
           paths.lib                 "lib",                 :load_path => true
           paths.lib.tasks           "lib/tasks",           :glob => "**/*.rake"
           paths.config              "config"
-          paths.config.environment  "config/environments", :glob => "#{Rails.env}.rb"
           paths.config.initializers "config/initializers", :glob => "**/*.rb"
           paths.config.locales      "config/locales",      :glob => "*.{rb,yml}"
           paths.config.routes       "config/routes.rb"
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 4c73809177..881c97f02d 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -54,5 +54,11 @@ module Rails
         raise "\"#{name}\" is a Railtie/Engine and cannot be installed as plugin"
       end
     end
+
+  protected
+
+    def reloadable?(app)
+      app.config.reload_plugins
+    end
   end
 end