-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// 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.
+// 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.
//
-// 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SALOME Registry : Registry server implementation
// File : RegistryConnexion.cxx
// Author : Pascale NOYRET - Antoine YESSAYAN, EDF
{
# include <stdio.h>
}
-using namespace std;
-
Registry::Components_var Connexion( int argc , char **argv , const char *ptrSessionName ) throw( CommException )
{
- Registry::Components_var varComponents = 0 ;
- ASSERT(ptrSessionName) ;
- ASSERT(strlen(ptrSessionName)>0) ;
- const char *registryName = "Registry" ;
-
- try
- {
- ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
- ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting()) ;
- CORBA::ORB_var &orb = init( argc , argv ) ;
-
- SALOME_NamingService &naming = *SINGLETON_<SALOME_NamingService>::Instance() ;
- ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting()) ;
- naming.init_orb( orb ) ;
-
- // Recuperation de la reference de l'objet
- CORBA::Object_var object = naming.Resolve( registryName ) ;
- if(CORBA::is_nil(object)) throw CommException( "unable to find the RegistryService" ) ;
-
- // Specialisation de l'objet generique
- varComponents = Registry::Components::_narrow( object ) ;
- ASSERT(! CORBA::is_nil(varComponents)) ;
- }
- catch( ... )
- {
- throw CommException ( "NamingService Connexion Error" ) ;
- }
- return varComponents ;
+ Registry::Components_var varComponents = 0 ;
+ ASSERT(ptrSessionName) ;
+ ASSERT(strlen(ptrSessionName)>0) ;
+ const char *registryName = "Registry" ;
+
+ try
+ {
+ ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
+ ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting()) ;
+ CORBA::ORB_var &orb = init( argc , argv ) ;
+
+ SALOME_NamingService &naming = *SINGLETON_<SALOME_NamingService>::Instance() ;
+ ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting()) ;
+ naming.init_orb( orb ) ;
+
+ // Recuperation de la reference de l'objet
+ CORBA::Object_var object = naming.Resolve( registryName ) ;
+ if(CORBA::is_nil(object)) throw CommException( "unable to find the RegistryService" ) ;
+
+ // Specialisation de l'objet generique
+ varComponents = Registry::Components::_narrow( object ) ;
+ ASSERT(! CORBA::is_nil(varComponents)) ;
+ }
+ catch( ... )
+ {
+ throw CommException ( "NamingService Connexion Error" ) ;
+ }
+ return varComponents ;
}
RegistryConnexion::RegistryConnexion( int argc , char **argv , const char *ior , const char *ptrSessionName, const char *componentName ): \
- _Ior(duplicate(ior)), _VarComponents( Connexion(argc,argv,ptrSessionName) ), _SessionName(ptrSessionName),_Name(""), _Id(0)
+ _Ior(duplicate(ior)), _VarComponents( Connexion(argc,argv,ptrSessionName) ), _SessionName(ptrSessionName),_Name(""), _Id(0)
{
- this->add( componentName ) ;
+ this->add( componentName ) ;
}
RegistryConnexion::RegistryConnexion( void ): _Ior(0), _VarComponents( 0 ), _Name(""), _Id(0)
{
- INTERRUPTION(EXIT_FAILURE) ;
+ INTERRUPTION(EXIT_FAILURE) ;
}
RegistryConnexion::~RegistryConnexion()
{
- BEGIN_OF("RegistryConnexion::~RegistryConnexion()" ) ;
- if( _Id != 0 )
- {
- ASSERT(_SessionName!="" ) ;
- ASSERT(_Name!="" ) ;
- _VarComponents->remove( _Id ) ;
- }
- _Id = 0 ;
-#ifndef WIN32
- delete [] _Ior;
-#else
- delete [] (char*) _Ior;
-#endif
- _Ior = 0;
- _SessionName = "";
- _Name = "" ;
- END_OF("RegistryConnexion::~RegistryConnexion()" ) ;
+ BEGIN_OF("RegistryConnexion::~RegistryConnexion()" ) ;
+ if( _Id != 0 )
+ {
+ ASSERT(_SessionName!="" ) ;
+ ASSERT(_Name!="" ) ;
+ _VarComponents->remove( _Id ) ;
+ }
+ _Id = 0 ;
+ delete [] (char*) _Ior;
+ _Ior = 0;
+ _SessionName = "";
+ _Name = "" ;
+ END_OF("RegistryConnexion::~RegistryConnexion()" ) ;
}
void RegistryConnexion::add( const char *aName )
{
- ASSERT(_SessionName!="" ) ;
- ASSERT(_Name=="" ) ;
- ASSERT(_Id==0 ) ;
- ASSERT(aName) ;
- SCRUTE(aName) ;
- ASSERT(strlen( aName )>0) ;
-
- const Identity lesInfos( aName ) ;
- Registry::Infos infos ;
- infos.name = CORBA::string_dup( lesInfos.name() ) ;
- infos.pid = lesInfos.pid() ;
- infos.machine = CORBA::string_dup( lesInfos.host_char() ) ;
- infos.adip = CORBA::string_dup( lesInfos.adip() ) ;
- infos.uid = (long)lesInfos.uid() ;
- infos.pwname = CORBA::string_dup( lesInfos.pwname() ) ;
- infos.tc_start = lesInfos.start() ;
- infos.tc_hello = 0 ;
- infos.tc_end = 0 ;
- infos.difftime = 0 ;
- infos.cdir = CORBA::string_dup( lesInfos.rep() ) ;
- infos.status = -1 ;
- infos.ior = CORBA::string_dup(_Ior);
-
- ASSERT(!CORBA::is_nil(this->_VarComponents)) ;
-
- CORBA::ULong id = _VarComponents->add( infos ) ;
-
- SCRUTE(aName) ; SCRUTE(id) ;
- ASSERT(id) ;
-
- _Id = id ;
- _Name = aName ;
-
- return ;
+ ASSERT(_SessionName!="" ) ;
+ ASSERT(_Name=="" ) ;
+ ASSERT(_Id==0 ) ;
+ ASSERT(aName) ;
+ SCRUTE(aName) ;
+ ASSERT(strlen( aName )>0) ;
+
+ const Identity lesInfos( aName ) ;
+ Registry::Infos infos ;
+ infos.name = CORBA::string_dup( lesInfos.name() ) ;
+ infos.pid = lesInfos.pid() ;
+ infos.machine = CORBA::string_dup( lesInfos.host_char() ) ;
+ infos.adip = CORBA::string_dup( lesInfos.adip() ) ;
+ infos.uid = (long)lesInfos.uid() ;
+ infos.pwname = CORBA::string_dup( lesInfos.pwname() ) ;
+ infos.tc_start = lesInfos.start() ;
+ infos.tc_hello = 0 ;
+ infos.tc_end = 0 ;
+ infos.difftime = 0 ;
+ infos.cdir = CORBA::string_dup( lesInfos.rep() ) ;
+ infos.status = -1 ;
+ infos.ior = CORBA::string_dup(_Ior);
+
+ ASSERT(!CORBA::is_nil(this->_VarComponents)) ;
+
+ CORBA::ULong id = _VarComponents->add( infos ) ;
+
+ SCRUTE(aName) ; SCRUTE(id) ;
+ ASSERT(id) ;
+
+ _Id = id ;
+ _Name = aName ;
+
+ return ;
}
void RegistryConnexion::remove( void )
{
- ASSERT(_Id>0) ;
- ASSERT(!CORBA::is_nil(this->_VarComponents)) ;
- _VarComponents->remove( _Id ) ;
+ ASSERT(_Id>0) ;
+ ASSERT(!CORBA::is_nil(this->_VarComponents)) ;
+ _VarComponents->remove( _Id ) ;
- _Name = "" ;
- _Id = 0 ;
+ _Name = "" ;
+ _Id = 0 ;
- return ;
+ return ;
}
