Container servant hold information about SSL mode or not

diff --git a/src/Session/Session_NS_wrapper.cxx b/src/Session/Session_NS_wrapper.cxx
index a5dd110a736e382780082c3c38a70163ea71260c..2619179e44bb8f9d1c9cf62429e703a6e30dcc02 100644 (file)
--- a/src/Session/Session_NS_wrapper.cxx
+++ b/src/Session/Session_NS_wrapper.cxx
@@ -62,7 +62,7 @@ void CommonActivateSession(CORBA::ORB_var orb, PortableServer::POA_var poa, QMut
   }
 }
 
-Engines_Container_i *OldStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv)
+Abstract_Engines_Container_i *OldStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv)
 {
   Engines_Container_i *_container = nullptr;
   try
@@ -230,7 +230,7 @@ void NewStyleNS::defineDefaultSALOMEKERNELNamingService()
   KERNEL::assignNamingServiceSL();
 }
 
-Engines_Container_i *NewStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv)
+Abstract_Engines_Container_i *NewStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv)
 {
   return KERNEL::getContainerSA();
 }

diff --git a/src/Session/Session_NS_wrapper.hxx b/src/Session/Session_NS_wrapper.hxx
index e7a62addaa86dd7f1013bba5fc9487cf957201c0..aa6466be2e74735a9d96872bae8541df7f005e7a 100644 (file)
--- a/src/Session/Session_NS_wrapper.hxx
+++ b/src/Session/Session_NS_wrapper.hxx
@@ -27,7 +27,7 @@
 class QMutex;
 class QWaitCondition;
 
-class Engines_Container_i;
+class Abstract_Engines_Container_i;
 
 class SESSION_EXPORT OldStyleNS
 {
@@ -38,7 +38,7 @@ public:
   void Register(CORBA::Object_ptr ObjRef, const char* Path) { _NS.Register(ObjRef,Path); }
   CORBA::Object_ptr Resolve(const char* Path) { return _NS.Resolve(Path); }
   RealNS *getNS() { return &_NS; }
-  Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv);
+  Abstract_Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv);
   static void defineDefaultSALOMEKERNELNamingService() { /* nothing to do by default true NamingService server is considered */ }
   static void activateContainerManager(CORBA::ORB_var orb);
   static void activateSession(CORBA::ORB_var orb, PortableServer::POA_var poa, QMutex *GUIMutex, QWaitCondition *GUILauncher, int argc, char ** argv);
@@ -61,7 +61,7 @@ public:
   void Register(CORBA::Object_ptr ObjRef, const char* Path) { _NS.Register(ObjRef,Path); }
   CORBA::Object_ptr Resolve(const char* Path) { return _NS.Resolve(Path); }
   RealNS *getNS() { return &_NS; }
-  Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv);
+  Abstract_Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv);
   static void defineDefaultSALOMEKERNELNamingService();
   static void activateContainerManager(CORBA::ORB_var orb);
   static void activateSession(CORBA::ORB_var orb, PortableServer::POA_var poa, QMutex *GUIMutex, QWaitCondition *GUILauncher, int argc, char ** argv);

diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx
index ee783f4fe1417fd423ec286a21c96f2926247b59..1e72f07cd4adf43f4d221046d1b1da6fcbf9f413 100644 (file)
--- a/src/Session/Session_ServerThread.hxx
+++ b/src/Session/Session_ServerThread.hxx
@@ -37,7 +37,7 @@
 void WaitForServerReadiness(std::string serverName);
 
 class SALOME_NamingService;
-class Engines_Container_i;
+class Abstract_Engines_Container_i;
 
 template<class MY_NS>
 class SESSION_EXPORT Session_ServerThread
@@ -72,7 +72,7 @@ protected:
   CORBA::ORB_var          _orb;
   PortableServer::POA_var _root_poa;
   std::unique_ptr<MY_NS>  _NS;
-  Engines_Container_i*    _container;
+  Abstract_Engines_Container_i*    _container;
 };
 
 class QMutex;