Remove distinction between batch managers ssh_batch and none

diff --git a/src/engine/BL_SALOMEServices.cxx b/src/engine/BL_SALOMEServices.cxx
index 1b579e5877623010ff0ae570232faa27867c0b65..0eb772e05519a2c1ad09c93533b4a7ca92ba9b61 100644 (file)
--- a/src/engine/BL_SALOMEServices.cxx
+++ b/src/engine/BL_SALOMEServices.cxx
@@ -179,7 +179,7 @@ BL::SALOMEServices::addResource(BL::ResourceDescr & new_resource)
 
   resource_definition->name = CORBA::string_dup(new_resource.name.c_str());
   resource_definition->hostname = CORBA::string_dup(new_resource.hostname.c_str());
-  if (new_resource.batch == "ssh_batch")
+  if (new_resource.batch == "none")
     resource_definition->type = CORBA::string_dup("single_machine");
   else
     resource_definition->type = CORBA::string_dup("cluster");

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index 1bf0f8a911190f6761f41fdce929378c98824450..f0261499101698c100b07d12c442dcf37e8535c2 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -131,7 +131,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
 
   QLabel * batch_label = new QLabel("Batch Manager:");
   _batch_line = new QComboBox(this);
-  _batch_line->addItem("None", "ssh_batch");
+  _batch_line->addItem("None", "none");
   _batch_line->addItem("CCC", "ccc");
   _batch_line->addItem("LSF", "lsf");
   _batch_line->addItem("SGE", "sge");