X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLifeCycleCORBA%2FSALOME_LifeCycleCORBA.hxx;h=13a9c52df07b2f27de9620094d5e20daf8cab839;hb=20c132438f5b8f7337bf35272989b10eb003d71c;hp=671af8fcdc08c8eb514be637e8a20c3aed275113;hpb=b83f7739ffb0509786b791c57366a57a4cc7c3e2;p=modules%2Fkernel.git

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
index 671af8fcd..13a9c52df 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOME_LifeCycleCORBA.hxx
 //  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
 //  Module : SALOME
@@ -49,7 +50,7 @@
 #endif
 
 
-class SALOME_NamingService;
+class SALOME_NamingService_Abstract;
 
 class LIFECYCLECORBA_EXPORT IncompatibleComponent : public SALOME_Exception
 {
@@ -61,23 +62,20 @@ public :
 class LIFECYCLECORBA_EXPORT SALOME_LifeCycleCORBA
 {
 public:
-  SALOME_LifeCycleCORBA(SALOME_NamingService *ns = 0);
+  SALOME_LifeCycleCORBA(SALOME_NamingService_Abstract *ns = 0);
   virtual ~SALOME_LifeCycleCORBA();
 
   Engines::EngineComponent_ptr 
   FindComponent(const Engines::ContainerParameters& params,
-                const char *componentName,
-                int studyId=0);
+                const char *componentName);
 
   Engines::EngineComponent_ptr
   LoadComponent(const Engines::ContainerParameters& params,
-                const char *componentName,
-                int studyId=0);
+                const char *componentName);
 
   Engines::EngineComponent_ptr 
   FindOrLoad_Component(const Engines::ContainerParameters& params,
-                       const char *componentName,
-                       int studyId =0);
+                       const char *componentName);
 
   Engines::EngineComponent_ptr
   FindOrLoad_Component(const char *containerName,
@@ -86,8 +84,7 @@ public:
   // Parallel extension
   Engines::EngineComponent_ptr 
     Load_ParallelComponent(const Engines::ContainerParameters& params,
-                           const char *componentName,
-                           int studyId);
+                           const char *componentName);
 
   bool isKnownComponentClass(const char *componentName);
 
@@ -98,11 +95,11 @@ public:
 
   Engines::ContainerManager_ptr getContainerManager();
   Engines::ResourcesManager_ptr getResourcesManager();
-  SALOME_NamingService * namingService();
+  SALOME_NamingService_Abstract * namingService();
   CORBA::ORB_ptr orb();
   void copyFile(const char* hostSrc, const char* fileSrc, const char* hostDest, const char* fileDest);
 
-  void shutdownServers();
+  void shutdownServers(bool shutdownLauncher=true);
   static void killOmniNames();
 
 protected:
@@ -115,19 +112,23 @@ protected:
   Engines::EngineComponent_ptr 
   _FindComponent(const Engines::ContainerParameters& params,
                  const char *componentName,
-                 int studyId,
                  const Engines::ResourceList& listOfResources);
 
   Engines::EngineComponent_ptr
   _LoadComponent(const Engines::ContainerParameters& params,
-                 const char *componentName,
-                 int studyId);
+                 const char *componentName);
 
-  SALOME_NamingService *_NS;
-  SALOME_NamingService *_NSnew;
+  SALOME_NamingService_Abstract *_NS;
+  SALOME_NamingService_Abstract *_NSnew;
   Engines::ContainerManager_var _ContManager;
   Engines::ResourcesManager_var _ResManager;
   
 } ;
 
+class LIFECYCLECORBA_EXPORT SALOME_LifeCycleCORBASSL : public SALOME_LifeCycleCORBA
+{
+public:
+  SALOME_LifeCycleCORBASSL();
+};
+
 #endif