Rename new ResourcesManager CORBA method

diff --git a/idl/SALOME_ContainerManager.idl b/idl/SALOME_ContainerManager.idl
index dff835faf0d4e33af641f25627e405e280da022b..917323813bd697fd1f46d5c9c9591ac7a4a1c808 100644 (file)
--- a/idl/SALOME_ContainerManager.idl
+++ b/idl/SALOME_ContainerManager.idl
@@ -248,7 +248,7 @@ interface ResourcesManager
       xml_file -> could be empty, in this case if write is true, resource manager will write
       the resource in its first ResourceCatalog file
     */
-  void AddResourceDefinition(in ResourceDefinition new_resource, in boolean write, in string xml_file) 
+  void AddResource(in ResourceDefinition new_resource, in boolean write, in string xml_file) 
     raises (SALOME::SALOME_Exception);
 };
 

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 74973d46354c6c3606f5135c5c2b9dd23fcb2abd..b244a3ea9423a075abe250d45231b346a0b59c9b 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -260,9 +260,9 @@ SALOME_ResourcesManager::GetResourceDefinition(const char * name)
 }
 
 void 
-SALOME_ResourcesManager::AddResourceDefinition(const Engines::ResourceDefinition& new_resource,
-                                              CORBA::Boolean write,
-                                              const char * xml_file)
+SALOME_ResourcesManager::AddResource(const Engines::ResourceDefinition& new_resource,
+                                    CORBA::Boolean write,
+                                    const char * xml_file)
 {
   ParserResourcesType resource;
   resource.Name = new_resource.name.in();
@@ -286,8 +286,8 @@ SALOME_ResourcesManager::AddResourceDefinition(const Engines::ResourceDefinition
   else if (aBatch == "")
     resource.Batch = none;
   else {
-    INFOS("Bad Batch definition in AddResourceDefinition: " << aBatch);
-    std::string message("Bad Batch definition in AddResourceDefinition: ");
+    INFOS("Bad Batch definition in AddResource: " << aBatch);
+    std::string message("Bad Batch definition in AddResource: ");
     message += aBatch;
     THROW_SALOME_CORBA_EXCEPTION(message.c_str(),SALOME::BAD_PARAM);
   }
@@ -308,8 +308,8 @@ SALOME_ResourcesManager::AddResourceDefinition(const Engines::ResourceDefinition
   else if (anMpi == "")
     resource.mpi = nompi;
   else {
-    INFOS("Bad MPI definition in AddResourceDefinition: " << anMpi);
-    std::string message("Bad MPI definition in AddResourceDefinition: ");
+    INFOS("Bad MPI definition in AddResource: " << anMpi);
+    std::string message("Bad MPI definition in AddResource: ");
     message += anMpi;
     THROW_SALOME_CORBA_EXCEPTION(message.c_str(),SALOME::BAD_PARAM);
   }
@@ -322,8 +322,8 @@ SALOME_ResourcesManager::AddResourceDefinition(const Engines::ResourceDefinition
   else if (mode_str == "")
     resource.Mode = interactive;
   else {
-    INFOS("Bad mode definition in AddResourceDefinition: " << mode_str);
-    std::string message("Bad mode definition in AddResourceDefinition: ");
+    INFOS("Bad mode definition in AddResource: " << mode_str);
+    std::string message("Bad mode definition in AddResource: ");
     message += mode_str;
     THROW_SALOME_CORBA_EXCEPTION(message.c_str(),SALOME::BAD_PARAM);
   }
@@ -336,8 +336,8 @@ SALOME_ResourcesManager::AddResourceDefinition(const Engines::ResourceDefinition
   else if (protocol == "")
     resource.Protocol = rsh;
   else {
-    INFOS("Bad protocol definition in AddResourceDefinition: " << protocol);
-    std::string message("Bad protocol definition in AddResourceDefinition: ");
+    INFOS("Bad protocol definition in AddResource: " << protocol);
+    std::string message("Bad protocol definition in AddResource: ");
     message += protocol;
     THROW_SALOME_CORBA_EXCEPTION(message.c_str(),SALOME::BAD_PARAM);
   }
@@ -350,8 +350,8 @@ SALOME_ResourcesManager::AddResourceDefinition(const Engines::ResourceDefinition
   else if (iprotocol == "")
     resource.ClusterInternalProtocol = rsh;
   else {
-    INFOS("Bad iprotocol definition in AddResourceDefinition: " << iprotocol);
-    std::string message("Bad iprotocol definition in AddResourceDefinition: ");
+    INFOS("Bad iprotocol definition in AddResource: " << iprotocol);
+    std::string message("Bad iprotocol definition in AddResource: ");
     message += iprotocol;
     THROW_SALOME_CORBA_EXCEPTION(message.c_str(),SALOME::BAD_PARAM);
   }

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx
index 38fa9eff27563463760897dd6438a9dc1e2691de..7573cdfb10174eaa8c44b6ce804aead4d06c35a0 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx
@@ -68,9 +68,9 @@ class SALOMERESOURCESMANAGER_EXPORT SALOME_ResourcesManager:
     char* FindFirst(const Engines::ResourceList& listOfResources);
     char* Find(const char *policy, const Engines::ResourceList& listOfResources);
     Engines::ResourceDefinition * GetResourceDefinition(const char * name);
-    void AddResourceDefinition(const Engines::ResourceDefinition& new_resource,
-                              CORBA::Boolean write,
-                              const char * xml_file);
+    void AddResource(const Engines::ResourceDefinition& new_resource,
+                    CORBA::Boolean write,
+                    const char * xml_file);
 
     // Cpp Methods
     void Shutdown();