Merge from BR_LIBBATCH_2_0

diff --git a/src/genericgui/ListJobs_GUI.hxx b/src/genericgui/ListJobs_GUI.hxx
index cea7468bdb0943f8c3348d2b2fb1dfc295e260aa..fbbcdc557e0a4be788ae72bc180292263090dbae 100644 (file)
--- a/src/genericgui/ListJobs_GUI.hxx
+++ b/src/genericgui/ListJobs_GUI.hxx
@@ -22,7 +22,7 @@
 
 #include <QtGui/QtGui>
 #include "SALOME_NamingService.hxx"
-#include "SALOME_ContainerManager.hh"
+#include "SALOME_Launcher.hh"
 
 // Kind of column
 // --------------

diff --git a/src/runtime/SalomeComponent.cxx b/src/runtime/SalomeComponent.cxx
index fe0de360148f8c466250d00234c21be9273ef099..5f4024c196428a69b9483a01dac0b132cf853b9c 100644 (file)
--- a/src/runtime/SalomeComponent.cxx
+++ b/src/runtime/SalomeComponent.cxx
@@ -89,9 +89,9 @@ void SalomeComponent::load()
   //This component has no specified container : use default container policy
   SALOME_NamingService ns(getSALOMERuntime()->getOrb());
   SALOME_LifeCycleCORBA LCC(&ns);
-  Engines::MachineParameters params;
+  Engines::ContainerParameters params;
   LCC.preSet(params);
-  params.hostname="localhost";
+  params.resource_params.name = "localhost";
   params.container_name ="FactoryServer";
   _objComponent=LCC.LoadComponent(params,_compoName.c_str());
 }

diff --git a/src/runtime/SalomeContainer.cxx b/src/runtime/SalomeContainer.cxx
index 593caf3b57ca07a0feb1c3e5202862b93e279dda..92da1e0c00a343b646cb1a3b6635f4b86dd73b75 100644 (file)
--- a/src/runtime/SalomeContainer.cxx
+++ b/src/runtime/SalomeContainer.cxx
@@ -54,56 +54,17 @@ using namespace std;
 SalomeContainer::SalomeContainer():_trueCont(Engines::Container::_nil()),_type("mono"),_shutdownLevel(999)
 {
   /* Init ContainerParameters */
-  _params.container_name = "";
+  SALOME_LifeCycleCORBA::preSet(_params);
   _params.mode= "start";
-  _params.workingdir= "";
-  _params.nb_proc = 0;
-  _params.isMPI = false;
-  _params.parallelLib = "";
-
-  _params.resource_params.name = "";
-  _params.resource_params.hostname = "";
-  _params.resource_params.OS = "";
-  _params.resource_params.nb_proc = 0;
-  _params.resource_params.mem_mb = 0;
-  _params.resource_params.cpu_clock = 0;
-  _params.resource_params.nb_node = 0;
-  _params.resource_params.nb_proc_per_node = 0;
-  _params.resource_params.policy = "";
-  // By default, componentList and resList length is 0
 }
 
-SalomeContainer::SalomeContainer(const SalomeContainer& other):Container(other),_trueCont(Engines::Container::_nil()),_type(other._type),
-                                                                                _shutdownLevel(other._shutdownLevel)
+SalomeContainer::SalomeContainer(const SalomeContainer& other)
+: Container(other),
+  _trueCont(Engines::Container::_nil()),
+  _type(other._type),
+  _shutdownLevel(other._shutdownLevel),
+  _params(other._params)
 {
-  _params.container_name = CORBA::string_dup(other._params.container_name);
-  _params.mode= CORBA::string_dup(other._params.mode);
-  _params.workingdir= CORBA::string_dup(other._params.workingdir);
-  _params.nb_proc = other._params.nb_proc;
-  _params.isMPI = other._params.isMPI;
-  _params.parallelLib = CORBA::string_dup(other._params.parallelLib);
-
-  _params.resource_params.name = CORBA::string_dup(other._params.resource_params.name);
-  _params.resource_params.hostname = CORBA::string_dup(other._params.resource_params.hostname);
-  _params.resource_params.OS = CORBA::string_dup(other._params.resource_params.OS);
-  _params.resource_params.nb_proc = other._params.resource_params.nb_proc;
-  _params.resource_params.mem_mb = other._params.resource_params.mem_mb;
-  _params.resource_params.cpu_clock = other._params.resource_params.cpu_clock;
-  _params.resource_params.nb_node = other._params.resource_params.nb_node;
-  _params.resource_params.nb_proc_per_node = other._params.resource_params.nb_proc_per_node;
-  _params.resource_params.policy = CORBA::string_dup(other._params.resource_params.policy);
-
-  _params.resource_params.componentList.length(other._params.resource_params.componentList.length());
-  for(CORBA::ULong i=0; i < other._params.resource_params.componentList.length(); i++)
-  {
-    _params.resource_params.componentList[i]=CORBA::string_dup(other._params.resource_params.componentList[i]);
-  }
-
-  _params.resource_params.resList.length(other._params.resource_params.resList.length());
-  for(CORBA::ULong i=0; i < other._params.resource_params.resList.length(); i++)
-  {
-    _params.resource_params.resList[i]=CORBA::string_dup(other._params.resource_params.resList[i]);
-  }
 }
 
 SalomeContainer::~SalomeContainer()