change Import for ImportTask and remove FileValidation from production config file

3 files changed, 4 insertions, 8 deletions

diff --git a/Gemfile b/Gemfile
index 6a8cb583c..b0372c67b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,6 @@ gem 'dr-apartment', :require => "apartment"
 gem 'coffee-rails', '~> 3.2.1'
 gem 'coffee-script-source'
 gem 'rabl'
-gem "rake", "~> 10.1.0"
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 1310bb091..a3bce8308 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -370,7 +370,6 @@ DEPENDENCIES
   rabl
   rails (= 3.2.6)
   rails-erd
-  rake (~> 10.1.0)
   ransack
   raphael-rails
   rb-fsevent
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 014b611f4..09f75565e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -113,18 +113,16 @@ ChouetteIhm::Application.configure do
   if ENV['OS'] == 'Windows_NT'
     config.to_prepare do
       Devise::Mailer.layout "mailer"
-      Chouette::Command.command = "C:/chouette/chouette-cmd_2.1.0/chouette.bat"
-      Import.root = "C:/chouette/chouette/imports"
+      Chouette::Command.command = "C:/chouette/chouette-cmd_2.2.0/chouette.bat"
+      ImportTask.root = "C:/chouette/chouette/imports"
       Export.root = "C:/chouette/chouette/exports"
-      FileValidation.root = "C:/chouette/chouette/validations"
     end
   else
     config.to_prepare do
       Devise::Mailer.layout "mailer"
-      Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-cmd_2.1.0/chouette"
-      Import.root = "/var/lib/chouette/imports"
+      Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-cmd_2.2.0/chouette"
+      ImportTask.root = "/var/lib/chouette/imports"
       Export.root = "/var/lib/chouette/exports"
-      FileValidation.root = "/var/lib/chouette/validations"
     end
   end