From 688072f6a9315ce66dddd1253c57a757ef87f35e Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 14 Apr 2022 18:52:40 +0300 Subject: [PATCH] #29456 [EDF] (2022-T1) Finalization of SSL implementation --- src/PVServerService/ENGINE/CMakeLists.txt | 1 - .../ENGINE/PVSERVER_SalomeSessionless.py | 49 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 src/PVServerService/ENGINE/PVSERVER_SalomeSessionless.py diff --git a/src/PVServerService/ENGINE/CMakeLists.txt b/src/PVServerService/ENGINE/CMakeLists.txt index 4cbc5e796..f40c59b9c 100644 --- a/src/PVServerService/ENGINE/CMakeLists.txt +++ b/src/PVServerService/ENGINE/CMakeLists.txt @@ -25,7 +25,6 @@ IF(NOT SALOME_LIGHT_ONLY) LIST(APPEND _bin_SCRIPTS PVSERVER.py PVSERVER_utils.py - PVSERVER_SalomeSessionless.py ) ENDIF() diff --git a/src/PVServerService/ENGINE/PVSERVER_SalomeSessionless.py b/src/PVServerService/ENGINE/PVSERVER_SalomeSessionless.py deleted file mode 100644 index 5694adde6..000000000 --- a/src/PVServerService/ENGINE/PVSERVER_SalomeSessionless.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2021 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -def buildInstance(orb): - from PVSERVER import PVSERVER - - # set SSL mode, if not done yes - import KernelBasis - KernelBasis.setSSLMode(True) - - # check if PYHELLO is already registered - import KernelServices - try: - return KernelServices.RetrieveCompo("PVSERVER"), orb - except Exception: - pass - - # initialize and register PVSERVER engine - import PortableServer - obj = orb.resolve_initial_references("RootPOA") - poa = obj._narrow(PortableServer.POA) - pman = poa._get_the_POAManager() - pman.activate() - # - from SALOME_ContainerPy import SALOME_ContainerPy_SSL_i - cont = SALOME_ContainerPy_SSL_i(orb, poa, "FactoryServer") - conObj = poa.id_to_reference(poa.activate_object(cont)) - # - servant = PVSERVER(orb, poa, conObj, "FactoryServer", "PVSERVER_inst_1", "PVSERVER") - ret = servant.getCorbaRef() - KernelServices.RegisterCompo("PVSERVER", ret) - return ret, orb -- 2.39.2