Merge from V5_1_main 14/05/2010

[modules/kernel.git] / src / LifeCycleCORBA / SALOME_LifeCycleCORBA.hxx

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
index dfbf3d7c9bfefad3265836c0720bc27ed6b22a8e..d5c0bb67ffd7e2635d82ca9431ab3601d474f620 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++
 //  File   : SALOME_LifeCycleCORBA.hxx
 //  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
@@ -68,44 +69,59 @@ public:
 
   Engines::Component_ptr 
   FindComponent(const Engines::MachineParameters& params,
-               const char *componentName,
-               int studyId=0);
+                const char *componentName,
+                int studyId=0);
 
   Engines::Component_ptr
   LoadComponent(const Engines::MachineParameters& params,
-               const char *componentName,
-               int studyId=0);
+                const char *componentName,
+                int studyId=0);
 
   Engines::Component_ptr 
   FindOrLoad_Component(const Engines::MachineParameters& params,
-                      const char *componentName,
-                      int studyId =0);
+                       const char *componentName,
+                       int studyId =0);
+
+  // SALOME 6 - Interface
+  Engines::Component_ptr 
+  FindOrLoad_Component(const Engines::ContainerParameters& params,
+                       const char *componentName,
+                       int studyId =0);
 
   Engines::Component_ptr
   FindOrLoad_Component(const char *containerName,
-                      const char *componentName); // for compatibility
+                       const char *componentName); // for compatibility
   
   // Parallel extension
   Engines::Component_ptr 
-    Load_ParallelComponent(const Engines::MachineParameters& params,
+    Load_ParallelComponent(const Engines::ContainerParameters& params,
                            const char *componentName,
                            int studyId);
 
   bool isKnownComponentClass(const char *componentName);
 
-  bool isMpiContainer(const Engines::MachineParameters& params)
+  bool isMpiContainer(const Engines::ContainerParameters& params)
     throw(IncompatibleComponent);
 
-  int NbProc(const Engines::MachineParameters& params);
+  int NbProc(const Engines::ContainerParameters& params);
 
-  void preSet(Engines::MachineParameters& params);
+  static void preSet(Engines::MachineParameters& outparams);
+  static void preSet(Engines::ResourceParameters& outparams);
+  static void preSet(Engines::ContainerParameters& outparams);
 
   Engines::ContainerManager_ptr getContainerManager();
   Engines::ResourcesManager_ptr getResourcesManager();
+  SALOME_NamingService * namingService();
+  CORBA::ORB_ptr orb();
+  void copyFile(const char* hostSrc, const char* fileSrc, const char* hostDest, const char* fileDest);
 
   void shutdownServers();
   static void killOmniNames();
 
+  // For SALOME 5.1.x
+  // Will be deleted on SALOME 6
+  void convert(const Engines::MachineParameters& params_in, 
+               Engines::ContainerParameters& params_out);
 protected:
 
   /*! Establish if a component called "componentName" in a container called
@@ -114,18 +130,18 @@ protected:
    *  This method uses Naming Service to find the component.
    */
   Engines::Component_ptr 
-  _FindComponent(const Engines::MachineParameters& params,
-                const char *componentName,
-                int studyId,
-                const Engines::MachineList& listOfMachines);
+  _FindComponent(const Engines::ContainerParameters& params,
+                 const char *componentName,
+                 int studyId,
+                 const Engines::ResourceList& listOfResources);
 
   Engines::Component_ptr
-  _LoadComponent(const Engines::MachineParameters& params,
-                const char *componentName,
-                int studyId,
-                const Engines::MachineList& listOfMachines);
-  
+  _LoadComponent(const Engines::ContainerParameters& params,
+                 const char *componentName,
+                 int studyId);
+
   SALOME_NamingService *_NS;
+  SALOME_NamingService *_NSnew;
   Engines::ContainerManager_var _ContManager;
   Engines::ResourcesManager_var _ResManager;