Add SSL mode

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 0983e1250f53fbb9ceef274d8a1ae0ccb65394f6..d15f955e0ad80798dbeb0557a2ceba59b45ee90b 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -37,4 +37,5 @@ SET(EFICAS_RESOURCES_FILES
 INSTALL(FILES ${EFICAS_RESOURCES_FILES} DESTINATION ${SALOME_EFICAS_INSTALL_RES_DATA})
 
 SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_EFICAS_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeAppSL.xml INSTALL ${SALOME_EFICAS_INSTALL_RES_DATA})
 SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/EFICASCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/EFICASCatalog.xml INSTALL ${SALOME_EFICAS_INSTALL_RES_DATA})

diff --git a/src/EFICAS/EFICAS.py b/src/EFICAS/EFICAS.py
index 967973f6d9ee901d0d408cb2e6d73c8973dc5280..dfbb3b890d275c34bcc2311e9e70da6f333e0d67 100644 (file)
--- a/src/EFICAS/EFICAS.py
+++ b/src/EFICAS/EFICAS.py
@@ -21,6 +21,7 @@
 import EFICAS_ORB__POA
 import SALOMEDS__POA
 import SALOME_ComponentPy
+import SALOME_Embedded_NamingService_ClientPy
 
 class SALOME_DriverPy_i(SALOMEDS__POA.Driver):
     """
@@ -85,4 +86,11 @@ class EFICAS(EFICAS_ORB__POA.EFICAS_Gen,
         SALOME_DriverPy_i.__init__( self, 'OTHER' )                    
         # On stocke dans l'attribut _naming_service, une reference sur
         # le Naming Service CORBA
-        self._naming_service=SALOME_ComponentPy.SALOME_NamingServicePy_i(self._orb)
+        #
+        emb_ns = self._contId.get_embedded_NS_if_ssl()
+        import CORBA
+        if CORBA.is_nil(emb_ns):
+            self._naming_service = SALOME_ComponentPy.SALOME_NamingServicePy_i( self._orb )
+        else:
+            self._naming_service = SALOME_Embedded_NamingService_ClientPy.SALOME_Embedded_NamingService_ClientPy(emb_ns)
+        #