Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated copyright message
[modules/kernel.git]
/
src
/
LifeCycleCORBA
/
SALOME_LifeCycleCORBA.hxx
diff --git
a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
old mode 100755
(executable)
new mode 100644
(file)
index
04aef7a
..
13a9c52
--- a/
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 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
//
// 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
//
//
// 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
// File : SALOME_LifeCycleCORBA.hxx
// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
// Module : SALOME
@@
-49,7
+50,7
@@
#endif
#endif
-class SALOME_NamingService;
+class SALOME_NamingService
_Abstract
;
class LIFECYCLECORBA_EXPORT IncompatibleComponent : public SALOME_Exception
{
class LIFECYCLECORBA_EXPORT IncompatibleComponent : public SALOME_Exception
{
@@
-61,23
+62,20
@@
public :
class LIFECYCLECORBA_EXPORT SALOME_LifeCycleCORBA
{
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,
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,
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,
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,
Engines::EngineComponent_ptr
FindOrLoad_Component(const char *containerName,
@@
-86,8
+84,7
@@
public:
// Parallel extension
Engines::EngineComponent_ptr
Load_ParallelComponent(const Engines::ContainerParameters& params,
// Parallel extension
Engines::EngineComponent_ptr
Load_ParallelComponent(const Engines::ContainerParameters& params,
- const char *componentName,
- int studyId);
+ const char *componentName);
bool isKnownComponentClass(const char *componentName);
bool isKnownComponentClass(const char *componentName);
@@
-98,11
+95,11
@@
public:
Engines::ContainerManager_ptr getContainerManager();
Engines::ResourcesManager_ptr getResourcesManager();
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);
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:
static void killOmniNames();
protected:
@@
-115,19
+112,23
@@
protected:
Engines::EngineComponent_ptr
_FindComponent(const Engines::ContainerParameters& params,
const char *componentName,
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 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;
} ;
Engines::ContainerManager_var _ContManager;
Engines::ResourcesManager_var _ResManager;
} ;
+class LIFECYCLECORBA_EXPORT SALOME_LifeCycleCORBASSL : public SALOME_LifeCycleCORBA
+{
+public:
+ SALOME_LifeCycleCORBASSL();
+};
+
#endif
#endif