Salome HOME
projects
/
modules
/
yacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c2e1b4
)
Driver command in ssl mode.
omu/driver_ssl
author
Ovidiu MIRCESCU
<ovidiu.mircescu@edf.fr>
Thu, 12 Aug 2021 15:42:21 +0000
(17:42 +0200)
committer
Ovidiu MIRCESCU
<ovidiu.mircescu@edf.fr>
Thu, 12 Aug 2021 15:42:21 +0000
(17:42 +0200)
src/yacsloader/driver.cxx
patch
|
blob
|
history
diff --git
a/src/yacsloader/driver.cxx
b/src/yacsloader/driver.cxx
index 67a2c7c3c4810cb2f123c3ae00e9e2c81089b1d6..81919420e534e45f76d3fa0eea952709d3665d95 100644
(file)
--- a/
src/yacsloader/driver.cxx
+++ b/
src/yacsloader/driver.cxx
@@
-32,11
+32,11
@@
#include "ObserverAsPlugin.hxx"
#ifdef SALOME_KERNEL
#include "ObserverAsPlugin.hxx"
#ifdef SALOME_KERNEL
-/*
+
#include "KernelBasis.hxx"
#include "SALOME_Launcher.hxx"
#include "ServiceUnreachable.hxx"
#include "KernelBasis.hxx"
#include "SALOME_Launcher.hxx"
#include "ServiceUnreachable.hxx"
-#include "SALOME_NamingService_Wrapper.hxx"
*/
+#include "SALOME_NamingService_Wrapper.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_ModuleCatalog.hh"
#include "Basics_Utils.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_ModuleCatalog.hh"
#include "Basics_Utils.hxx"
@@
-299,11
+299,11
@@
bool parse_init_port(const std::string& input, std::string& node, std::string& p
return true;
}
return true;
}
-
/*
void InitializeSSL()
+void InitializeSSL()
{
setSSLMode(true);
KERNEL::getLauncherSA();
{
setSSLMode(true);
KERNEL::getLauncherSA();
-}
*/
+}
int main (int argc, char* argv[])
{
int main (int argc, char* argv[])
{
@@
-350,7
+350,7
@@
int main (int argc, char* argv[])
setsig(SIGTERM,&Handler);
#endif
setsig(SIGTERM,&Handler);
#endif
-
//
InitializeSSL();
+ InitializeSSL();
timer("Starting ");
long flags = RuntimeSALOME::UsePython + RuntimeSALOME::UseCorba + RuntimeSALOME::UseXml + \
timer("Starting ");
long flags = RuntimeSALOME::UsePython + RuntimeSALOME::UseCorba + RuntimeSALOME::UseXml + \
@@
-364,8
+364,8
@@
int main (int argc, char* argv[])
CORBA::ORB_ptr orb = runTime->getOrb();
if (orb)
{
CORBA::ORB_ptr orb = runTime->getOrb();
if (orb)
{
-
//
SALOME_NamingService_Wrapper namingService(orb);
- SALOME_NamingService namingService(orb);
+ SALOME_NamingService_Wrapper namingService(orb);
+
//
SALOME_NamingService namingService(orb);
CORBA::Object_var obj = namingService.Resolve("/Kernel/ModulCatalog");
SALOME_ModuleCatalog::ModuleCatalog_var aModuleCatalog = SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj);
if (! CORBA::is_nil(aModuleCatalog))
CORBA::Object_var obj = namingService.Resolve("/Kernel/ModulCatalog");
SALOME_ModuleCatalog::ModuleCatalog_var aModuleCatalog = SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj);
if (! CORBA::is_nil(aModuleCatalog))