Merge branch 'agy/ssl_0'

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index fc1db2ac19c6f2ffec16236060e272254b92857b..621fc466c4530577e30ea56b5ae1c2020d84239c 100644 (file)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -33,6 +33,7 @@
 #include <Utils_SALOME_Exception.hxx>
 #include <Utils_SINGLETON.hxx>
 #include <utilities.h>
+#include "KernelBasis.hxx"
 
 #include "Session_Session_i.hxx"
 #include "Session_ServerCheck.hxx"
@@ -383,6 +384,7 @@ int AbstractGUIAppMain(int argc, char **argv);
 class GUIAppOldStyle
 {
 public:
+  static constexpr bool SSL_MODE = false;
   using NamingServiceImplementation = OldStyleNS;
   void connectToNSIfNeeded(CORBA::ORB_ptr orb) { _NS.reset(new SALOME_NamingService(orb)); }
   void shutdownCORBAStufIfNeeded(bool shutdownAll, CORBA::ORB_ptr orb);
@@ -396,6 +398,7 @@ private:
 class GUIAppNewStyle
 {
 public:
+  static constexpr bool SSL_MODE = true;
   using NamingServiceImplementation = NewStyleNS;
   void connectToNSIfNeeded(CORBA::ORB_ptr orb) { /*! nothing */ }
   void shutdownCORBAStufIfNeeded(bool shutdownAll, CORBA::ORB_ptr orb) { /*! nothing */ }
@@ -451,6 +454,7 @@ template<class GUI_APP_STYLE>
 int AbstractGUIAppMain(int argc, char **argv)
 {
   using NamingServiceImplementation = typename GUI_APP_STYLE::NamingServiceImplementation;
+  setSSLMode(GUI_APP_STYLE::SSL_MODE);
   GUI_APP_STYLE self;
   // Set-up application settings configuration (as for QSettings)
   // Note: these are default settings which can be customized (see below)

diff --git a/src/Session/salome2810.cxx b/src/Session/salome2810.cxx
index 10b0cf2f4ef573923bd44c443d677e4a0748fb6f..ec9f80443c0bf86367915f1dbea9b23b3f36fd9d 100644 (file)
--- a/src/Session/salome2810.cxx
+++ b/src/Session/salome2810.cxx
@@ -28,8 +28,8 @@ int main(int argc, char *argv[])
   constexpr char MAIN_PROGRAM[] = "SALOME_Session_Server_No_Server";
   constexpr char NO_SERVER_ENV_VAR[] = "SALOME_EMB_SERVANT";
 #ifndef WIN32
-  const char *MODULES[]={"SHAPERSTUDY","GEOM","SMESH","HYBRIDPLUGIN","GHS3DPLUGIN","BLSURFPLUGIN","GMSHPLUGIN","HEXABLOCKPLUGIN","HEXOTICPLUGIN","GHS3DPRLPLUGIN","NETGENPLUGIN"};
-  const char *MODULES_PATH[]={"GUI","SHAPER","SHAPERSTUDY","GEOM","SMESH","HYBRIDPLUGIN","GHS3DPLUGIN","BLSURFPLUGIN","GMSHPLUGIN","HEXABLOCKPLUGIN","GHS3DPRLPLUGIN","NETGENPLUGIN"};
+  const char *MODULES[]={"SHAPERSTUDY","GEOM","SMESH","YACS","HYBRIDPLUGIN","GHS3DPLUGIN","BLSURFPLUGIN","GMSHPLUGIN","HEXABLOCKPLUGIN","HEXOTICPLUGIN","GHS3DPRLPLUGIN","NETGENPLUGIN"};
+  const char *MODULES_PATH[]={"GUI","SHAPER","SHAPERSTUDY","GEOM","SMESH","YACS","HYBRIDPLUGIN","GHS3DPLUGIN","BLSURFPLUGIN","GMSHPLUGIN","HEXABLOCKPLUGIN","GHS3DPRLPLUGIN","NETGENPLUGIN"};
 #else
   const char *MODULES[]={"SHAPERSTUDY","GEOM","SMESH","HYBRIDPLUGIN","BLSURFPLUGIN","GMSHPLUGIN","HEXABLOCKPLUGIN","HEXOTICPLUGIN","NETGENPLUGIN"};
   const char *MODULES_PATH[]={"GUI","SHAPER","SHAPERSTUDY","GEOM","SMESH","HYBRIDPLUGIN","BLSURFPLUGIN","GMSHPLUGIN","HEXABLOCKPLUGIN","NETGENPLUGIN"};
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
   args << catalogs.join("::");
   args << ")";
   args << "--with" << "SALOMEDS" <<  "(" << ")" << "--with" << "Container" << "(" << "FactoryServer" << ")" << "--with" << "SalomeAppEngine" << "(" << ")" << "CPP";
-  args << QString("--resources=%1").arg(resfile) << "--modules" << "(SHAPER:GEOM:SMESH)";
+  args << QString("--resources=%1").arg(resfile) << "--modules" << "(SHAPER:GEOM:SMESH:YACS)";
   if( pe.contains("VERBOSE") )
   {
     std::cout << "Overloaded env var :" << std::endl;