X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNamingService%2FSALOME_NamingService.hxx;h=07605c6f74e913737d9074589a85fecdcb384b3a;hb=8a89a50b36a47cba1839646c0623562f30af9c28;hp=57e53ab75b0541d1c2617c330843e588130f3742;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx index 57e53ab75..07605c6f7 100644 --- a/src/NamingService/SALOME_NamingService.hxx +++ b/src/NamingService/SALOME_NamingService.hxx @@ -1,31 +1,31 @@ -// SALOME NamingService : wrapping NamingService services +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 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 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 +// 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, 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 +// + +// SALOME NamingService : wrapping NamingService services // File : SALOME_NamingService.hxx // Author : Estelle Deville // Module : SALOME // $Header$ - +// #ifndef SALOME_NAMINGSERVICE_H #define SALOME_NAMINGSERVICE_H @@ -35,22 +35,13 @@ #include #include -#include "utilities.h" #include "Utils_Mutex.hxx" #include "ServiceUnreachable.hxx" -#if defined NAMINGSERVICE_EXPORTS -#if defined WIN32 -#define NAMINGSERVICE_EXPORT __declspec( dllexport ) -#else -#define NAMINGSERVICE_EXPORT -#endif -#else -#if defined WNT -#define NAMINGSERVICE_EXPORT __declspec( dllimport ) -#else -#define NAMINGSERVICE_EXPORT -#endif +#include "SALOME_NamingService_defs.hxx" + +#ifdef WIN32 +#pragma warning(disable:4290) // Warning Exception ... #endif class NAMINGSERVICE_EXPORT SALOME_NamingService @@ -61,68 +52,51 @@ public: virtual ~SALOME_NamingService(); - void init_orb(CORBA::ORB_ptr orb); - void Register(CORBA::Object_ptr ObjRef, - const char* Path) - throw(ServiceUnreachable); - CORBA::Object_ptr Resolve(const char* Path) - throw( ServiceUnreachable); - CORBA::Object_ptr ResolveFirst(const char* Path) - throw( ServiceUnreachable); + void init_orb(CORBA::ORB_ptr orb=0); + void Register(CORBA::Object_ptr ObjRef, const char* Path) throw(ServiceUnreachable); + CORBA::Object_ptr Resolve(const char* Path) throw( ServiceUnreachable); + CORBA::Object_ptr ResolveFirst(const char* Path) throw( ServiceUnreachable); CORBA::Object_ptr ResolveComponent(const char* hostname, - const char* containerName, - const char* componentName, - const int nbproc=0) - throw(ServiceUnreachable); + const char* containerName, + const char* componentName, + const int nbproc=0) throw(ServiceUnreachable); std::string ContainerName(const char *ContainerName); - std::string ContainerName(const Engines::MachineParameters& params); - std::string BuildContainerNameForNS(const char *ContainerName, - const char *hostname); - std::string - BuildContainerNameForNS(const Engines::MachineParameters& params, - const char *hostname); - int Find(const char* name) - throw(ServiceUnreachable); - bool Create_Directory(const char* Path) - throw(ServiceUnreachable); - bool Change_Directory(const char* Path) - throw(ServiceUnreachable); - char* Current_Directory() - throw(ServiceUnreachable); - void list() - throw(ServiceUnreachable); - std::vector list_directory() - throw(ServiceUnreachable); - std::vector list_subdirs() - throw(ServiceUnreachable); - std::vector list_directory_recurs() - throw(ServiceUnreachable); - void Destroy_Name(const char* Path) - throw(ServiceUnreachable); - virtual void Destroy_Directory(const char* Path) - throw(ServiceUnreachable); - virtual void Destroy_FullDirectory(const char* Path) - throw(ServiceUnreachable); - char* getIORaddr(); + std::string ContainerName(const Engines::ContainerParameters& params); + std::string BuildContainerNameForNS(const char *ContainerName, const char *hostname); + std::string BuildContainerNameForNS(const Engines::ContainerParameters& params, const char *hostname); + + int Find(const char* name) throw(ServiceUnreachable); + bool Create_Directory(const char* Path) throw(ServiceUnreachable); + bool Change_Directory(const char* Path) throw(ServiceUnreachable); + char* Current_Directory() throw(ServiceUnreachable); + void list() throw(ServiceUnreachable); + std::vector list_directory() throw(ServiceUnreachable); + std::vector list_subdirs() throw(ServiceUnreachable); + std::vector list_directory_recurs() throw(ServiceUnreachable); + void Destroy_Name(const char* Path) throw(ServiceUnreachable); + virtual void Destroy_Directory(const char* Path) throw(ServiceUnreachable); + virtual void Destroy_FullDirectory(const char* Path) throw(ServiceUnreachable); + char *getIORaddr(); + CORBA::ORB_ptr orb(); protected: Utils_Mutex _myMutex; - CORBA::ORB_ptr _orb; + CORBA::ORB_var _orb; CosNaming::NamingContext_var _root_context, _current_context; void _initialize_root_context(); int _createContextNameDir(std::string path, - CosNaming::Name& context_name, - std::vector& splitPath, - bool onlyDir); + CosNaming::Name& context_name, + std::vector& splitPath, + bool onlyDir); void _Find(const char* name, CORBA::Long& occurence_number); void _current_directory(std::vector& splitPath, - int& lengthResult, - CosNaming::NamingContext_var contextToFind, - bool& notFound); + int& lengthResult, + CosNaming::NamingContext_var contextToFind, + bool& notFound); void _list_directory_recurs(std::vector& myList, - std::string relativeSubDir, - std::string absCurDirectory); + std::string relativeSubDir, + std::string absCurDirectory); };