DataServerManager is now available in SSL mode

[modules/kernel.git] / src / KERNEL_PY / __init__.py

diff --git a/src/KERNEL_PY/__init__.py b/src/KERNEL_PY/__init__.py
index cbe51e8e04e3cb8bf575c08e0ddd21ac21a9ef50..5c0900e62689a9a8faecc18f3c7453475faacbfa 100644 (file)
--- a/src/KERNEL_PY/__init__.py
+++ b/src/KERNEL_PY/__init__.py
@@ -184,6 +184,10 @@ def salome_init(path=None, embedded=False):
             salome_init_with_session(path, embedded)
 
 class StandAloneLifecyle:
+    def __init__(self, containerManager, resourcesManager):
+        self._cm = containerManager
+        self._rm = resourcesManager
+
     def FindOrLoadComponent(self,contName,moduleName):
         global orb
         import importlib
@@ -193,9 +197,14 @@ class StandAloneLifecyle:
         return result
         #raise RuntimeError("Undealed situation cont = {} module = {}".format(contName,moduleName))
 
+    def getContainerManager(self):
+      return self._cm
+
+    def getResourcesManager(self):
+      return self._rm
+
 def salome_init_without_session():
-    global lcc,myStudy,orb,modulcat,sg,cm
-    lcc = StandAloneLifecyle()
+    global lcc,naming_service,myStudy,orb,modulcat,sg,cm
     import KernelBasis
     KernelBasis.setSSLMode(True)
     import KernelDS
@@ -207,13 +216,16 @@ def salome_init_without_session():
     from salome_kernel import list_of_catalogs_regarding_environement
     modulcat = KernelModuleCatalog.myModuleCatalog( list_of_catalogs_regarding_environement() )
     import KernelLauncher
+    from NamingService import NamingService
     cm = KernelLauncher.myContainerManager()
+    lcc = StandAloneLifecyle(cm, KernelLauncher.myResourcesManager())
     # activate poaManager to accept co-localized CORBA calls.
     poa = orb.resolve_initial_references("RootPOA")
     poaManager = poa._get_the_POAManager()
     poaManager.activate()
     sg = SalomeOutsideGUI()
     salome_study_init_without_session()
+    naming_service = NamingService()
 
 def salome_init_with_session(path=None, embedded=False):
     """
@@ -270,6 +282,8 @@ def salome_close():
     salome_iapp_close()
     salome_study_close()
     myStudy, myStudyName = None, None
+    import KernelDS
+    KernelDS.KillGlobalSessionInstance()
     pass
 
 def salome_NS():