bos #26460 Merge branch 'occ/ssl'

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 1dcc498cb722f24ab93e85df15119f78adb85251..130e648ccfeeceb84a4cbee8db0ed0fea39bf18e 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -82,4 +82,5 @@ SET(HOMARD_RESOURCES_FILES
 INSTALL(FILES ${HOMARD_RESOURCES_FILES} DESTINATION ${SALOME_HOMARD_INSTALL_RES_DATA})
 
 SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_HOMARD_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeAppSL.xml INSTALL ${SALOME_HOMARD_INSTALL_RES_DATA})
 SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/HOMARDCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/HOMARDCatalog.xml INSTALL ${SALOME_HOMARD_INSTALL_RES_DATA})

diff --git a/src/HOMARDGUI/CMakeLists.txt b/src/HOMARDGUI/CMakeLists.txt
index 21dc2a5b2c74d4c6fcc9a54bff2c38e6d58557a2..f8b1518967908b10c0dbd759771614daa55714ea 100644 (file)
--- a/src/HOMARDGUI/CMakeLists.txt
+++ b/src/HOMARDGUI/CMakeLists.txt
@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}/adm_local/unix
   ${PROJECT_SOURCE_DIR}/src/HOMARD
   ${PROJECT_SOURCE_DIR}/src/HOMARD_I
+  ${PROJECT_SOURCE_DIR}/src/FrontTrack
 )
 
 # additional preprocessor / compiler flags

diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index a0759a26c39b1f665e697a6931860bf6c40c3bbe..e42bfd9951da61e1c884620a92758db866e7a20b 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -48,6 +48,8 @@
 #include "SalomeApp_Module.h"
 #include "SALOMEconfig.h"
 #include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOME_NamingService_Abstract.hxx>
+#include <SALOME_KernelServices.hxx>
 
 #include <utilities.h>
 
@@ -77,6 +79,7 @@
 //Pour le _CAST
 #include "SALOMEDS_Study.hxx"
 #include "HOMARDGUI_Utils.h"
+#include "HOMARD_Component_Generator.hxx"
 
 using namespace std;
 
@@ -104,7 +107,18 @@ HOMARDGUI::~HOMARDGUI()
 //=======================================================================
 HOMARD::HOMARD_Gen_var HOMARDGUI::InitHOMARDGen(SalomeApp_Application* app)
 {
-  Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer","HOMARD" );
+  SALOME_NamingService_Abstract *ns = SalomeApp_Application::namingService();
+  Engines::EngineComponent_var comp;
+  if (ns->IsTrueNS())
+  {
+    comp = app->lcc()->FindOrLoad_Component( "FactoryServer","HOMARD" );
+  }
+  else
+  {
+    comp = RetrieveHOMARDInstance();
+    CORBA::Object_var comp2 = CORBA::Object::_narrow(comp);
+    KERNEL::RegisterCompo("HOMARD",comp2);
+  }
   HOMARD::HOMARD_Gen_var clr = HOMARD::HOMARD_Gen::_narrow(comp);
   ASSERT(!CORBA::is_nil(clr));
   return clr;

diff --git a/src/HOMARD_I/CMakeLists.txt b/src/HOMARD_I/CMakeLists.txt
index d22c3725ad42e3f30cdcc264c274327382a90359..274c8afd61b0d71d022832aba7ef0887c21a90f8 100644 (file)
--- a/src/HOMARD_I/CMakeLists.txt
+++ b/src/HOMARD_I/CMakeLists.txt
@@ -61,6 +61,7 @@ SET(_link_LIBRARIES
 # header files / no moc processing
 SET(HOMARDEngine_HEADERS
   HOMARD_Cas_i.hxx
+  HOMARD_Component_Generator.hxx
   HOMARD_Hypothesis_i.hxx
   HOMARD_Iteration_i.hxx
   HOMARD_Zone_i.hxx
@@ -78,6 +79,7 @@ SET(HOMARDEngine_HEADERS
 # sources / static
 SET(HOMARDEngine_SOURCES
   HOMARD_Cas_i.cxx
+  HOMARD_Component_Generator.cxx
   HOMARD_Hypothesis_i.cxx
   HOMARD_Iteration_i.cxx
   HOMARD_Gen_i.cxx

diff --git a/src/HOMARD_I/HOMARD_Component_Generator.cxx b/src/HOMARD_I/HOMARD_Component_Generator.cxx
new file mode 100644 (file)
index 0000000..c104cfb
--- /dev/null
+++ b/src/HOMARD_I/HOMARD_Component_Generator.cxx
@@ -0,0 +1,56 @@
+// Copyright (C) 2021  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// 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
+//
+
+#include "HOMARD_Component_Generator.hxx"
+
+#include "SALOME_Container_i.hxx"
+#include "SALOME_KernelServices.hxx"
+
+#include <cstring>
+
+static Engines::EngineComponent_var _unique_compo;
+
+Engines::EngineComponent_var RetrieveHOMARDInstance()
+{
+  constexpr char COMPO_NAME[]="HOMARD";
+  if (CORBA::is_nil(_unique_compo))
+  {
+    CORBA::ORB_var orb;
+    {
+      int argc(0);
+      orb = CORBA::ORB_init(argc, nullptr);
+    }
+    CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);
+    PortableServer::POAManager_var pman = poa->the_POAManager();
+    CORBA::PolicyList policies;
+    policies.length(0);
+    auto *cont(KERNEL::getContainerSA());
+    PortableServer::ObjectId *conId(cont->getCORBAId());
+    //
+    pman->activate();
+    //
+    HOMARD_Gen_i_No_Session *servant = new HOMARD_Gen_i_No_Session(orb, poa, conId, "HOMARD_inst_2", COMPO_NAME);
+    PortableServer::ObjectId *zeId = servant->getId();
+    CORBA::Object_var zeRef = poa->id_to_reference(*zeId);
+    KERNEL::RegisterCompo(COMPO_NAME,zeRef);
+    _unique_compo = Engines::EngineComponent::_narrow(zeRef);
+  }
+  return _unique_compo;
+}

diff --git a/src/HOMARD_I/HOMARD_Component_Generator.hxx b/src/HOMARD_I/HOMARD_Component_Generator.hxx
new file mode 100644 (file)
index 0000000..9ddaa82
--- /dev/null
+++ b/src/HOMARD_I/HOMARD_Component_Generator.hxx
@@ -0,0 +1,28 @@
+// Copyright (C) 2021  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// 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
+//
+
+#pragma once
+
+#include "HOMARD_Gen_i_No_Session.hxx"
+
+#include "SALOMEconfig.h"
+
+#include CORBA_SERVER_HEADER(HOMARD_Gen)
+
+HOMARDENGINE_EXPORT Engines::EngineComponent_var RetrieveHOMARDInstance();