updated copyright message

[modules/kernel.git] / src / Registry / SALOME_Registry_Server.cxx

diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index 8a8f4756929a387ddab148a6625d7c6c2da14de3..48336bc5d335b27a6329b27ba82c55addaf24726 100644 (file)
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -35,8 +35,9 @@ extern "C"
 # include <stdio.h>
 }
 
+#include "ArgvKeeper.hxx"
 #include "utilities.h"
-#include "Utils_ORB_INIT.hxx"
+#include "OpUtil.hxx"
 #include "Utils_SINGLETON.hxx"
 #include "Utils_SALOME_Exception.hxx"
 #include "Utils_CommException.hxx"
@@ -50,12 +51,12 @@ extern "C"
 
 int main( int argc , char **argv )
 {
-  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
-  CORBA::ORB_var &orb = init( argc , argv ) ;
+  SetArgcArgv( argc, argv );
+  CORBA::ORB_var orb = KERNEL::GetRefToORB();
   //  LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
-  BEGIN_OF( argv[0] )
-    INFOS_COMPILATION 
-    SCRUTE(argc) 
+  BEGIN_OF( argv[0] );
+    INFOS_COMPILATION;
+    SCRUTE(argc);
     if( argc<3 )
       {
         MESSAGE("you must provide the Salome session name when you call SALOME_Registry_Server") ;
@@ -77,9 +78,6 @@ int main( int argc , char **argv )
   const char *registryName = "Registry" ;
   long TIMESleep = 250000000;
   int NumberOfTries = 40;
-#ifndef WIN32
-  int a;
-#endif
   timespec ts_req;
   ts_req.tv_nsec=TIMESleep;
   ts_req.tv_sec=0;
@@ -106,7 +104,7 @@ int main( int argc , char **argv )
     {
       if (i!=1) 
 #ifndef WIN32
-        a=nanosleep(&ts_req,&ts_rem);
+        nanosleep(&ts_req,&ts_rem);
 #else
     Sleep(TIMESleep/1000000);
 #endif
@@ -135,7 +133,7 @@ int main( int argc , char **argv )
                 {
                   if (j!=1) 
 #ifndef WIN32
-                    a=nanosleep(&ts_req, &ts_rem);
+                    nanosleep(&ts_req, &ts_rem);
 #else
                         Sleep(TIMESleep/1000000);
 #endif
@@ -143,7 +141,7 @@ int main( int argc , char **argv )
                     {
                       object = inc->resolve(name);
                     }
-                  catch(CosNaming::NamingContext::NotFound)
+                  catch(CosNaming::NamingContext::NotFound&)
                     {
                       MESSAGE( "Registry Server: Logger Server wasn't found" );
                     }
@@ -170,7 +168,17 @@ int main( int argc , char **argv )
       RegistryService *ptrRegistry = SINGLETON_<RegistryService>::Instance() ;
       ptrRegistry->SessionName( ptrSessionName ) ;
       ptrRegistry->SetOrb(orb);
-      varComponents = ptrRegistry->_this() ;
+      //
+      CORBA::PolicyList policies;
+      policies.length(1);
+      PortableServer::ThreadPolicy_var threadPol(poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
+      policies[0]=PortableServer::ThreadPolicy::_duplicate(threadPol);
+      PortableServer::POA_var poa2(poa->create_POA("SingleThreadPOA4RegistryStandalone",manager,policies));
+      threadPol->destroy();
+      //
+      PortableServer::ObjectId_var id(poa2->activate_object(ptrRegistry));
+      CORBA::Object_var pipo=poa2->id_to_reference(id);
+      varComponents = Registry::Components::_narrow(pipo) ;
       ptrRegistry->_remove_ref(); //let poa manage registryservice deletion
       // The RegistryService must not already exist.
             
@@ -216,7 +224,7 @@ int main( int argc , char **argv )
     }
   catch( const SALOME_Exception &ex )
     {
-      MESSAGE( "Communication Error : " << ex.what() )
+      MESSAGE( "Communication Error : " << ex.what() );
         return EXIT_FAILURE ;
     }