Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index ef29c07..559e03d 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,7 +2,6 @@
 require File.expand_path('../application', __FILE__)
 require 'RMagick'
 require 'rest_client'
-require 'inspire'
 
 require 'picture_io'
 require 'pettan_imager'
@@ -10,11 +9,16 @@ require 'ar_helper'
 require 'operator'
 require 'import_result'
 require 'common'
-require 'item'
-require 'owner'
-require 'content'
-require 'element'
-require 'element_part'
+# define Peta::Item before load model.
+require_dependency 'peta'
+# load Manifest(SystemResource.engine_resource) before config route
+require_dependency 'manifest'
 # Initialize the rails application
+Manifest.manifest.init
 Pettanr::Application.initialize!
-Pettanr::Application.manifest.init
+require_dependency 'local_manifest'
+require_dependency 'locmare'
+require_dependency 'editor'
+LocalManifest.manifest.init
+Manifest.manifest.init_after_load_manifest
+Manifest.manifest.load_models_manifest