From 86b7cb1a6815d7a1b7d76c391cbff567e9b5649b Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Thu, 21 Apr 2022 11:58:07 +0200 Subject: [PATCH] Finalization of SSL implementation (OCC for Tuleap [bos #29456]) Removing any module specific code for SSL mode because it's done in the KERNEL --- src/daSalome/daGUI/ADAO_SalomeSessionless.py | 52 -------------------- src/daSalome/daGUI/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 src/daSalome/daGUI/ADAO_SalomeSessionless.py diff --git a/src/daSalome/daGUI/ADAO_SalomeSessionless.py b/src/daSalome/daGUI/ADAO_SalomeSessionless.py deleted file mode 100644 index aa4aead..0000000 --- a/src/daSalome/daGUI/ADAO_SalomeSessionless.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2022 EDF R&D -# -# This file is part of SALOME ADAO module -# -# 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 ADAO import ADAO - - # set SSL mode, if not done yes - import KernelBasis - KernelBasis.setSSLMode(True) - - # check if ADAO is already registered - import KernelServices - try: - return KernelServices.RetrieveCompo("ADAO"), orb - except Exception: - pass - - # initialize and register ADAO 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 = ADAO(orb, poa, conObj, "FactoryServer", "ADAO_inst_1", "ADAO") - ret = servant.getCorbaRef() - KernelServices.RegisterCompo("ADAO", ret) - return ret, orb diff --git a/src/daSalome/daGUI/CMakeLists.txt b/src/daSalome/daGUI/CMakeLists.txt index c6fbd1a..8ed153b 100644 --- a/src/daSalome/daGUI/CMakeLists.txt +++ b/src/daSalome/daGUI/CMakeLists.txt @@ -20,7 +20,7 @@ if(ADAO_SALOME_MODULE) - install(FILES ADAOGUI.py ADAO.py ADAO_SalomeSessionless.py DESTINATION ${ADAO_SCRIPT_PYTHON_SALOME}) + install(FILES ADAOGUI.py ADAO.py DESTINATION ${ADAO_SCRIPT_PYTHON_SALOME}) else(ADAO_SALOME_MODULE) -- 2.39.2