diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-13 18:56:58 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-13 18:56:58 +0000 |
| commit | 7a7876a5fb8fac3f771431ce54cc806e41d1b7cf (patch) | |
| tree | 65a2d56f7e3eb942bbb8c3fd2a7ca6ff069c909f /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | Added editor for replica groups (diff) | |
| download | ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.tar.bz2 ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.tar.xz ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.zip | |
Removed identity properties
Added description attribute to replica group and node descriptors.
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 949f990793c..fe694d478bc 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -332,13 +332,8 @@ NodeService::start(int argc, char* argv[]) // collocated locator (this property is passed by the // activator to each activated server). // - const string locatorIdProperty = "IceGrid.Registry.LocatorIdentity"; - string locatorId = properties->getProperty(locatorIdProperty); - if(locatorId.empty()) - { - const string instanceNameProperty = "IceGrid.InstanceName"; - locatorId = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid") + "/Locator"; - } + const string instanceNameProperty = "IceGrid.InstanceName"; + const string locatorId = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid") + "/Locator"; string locatorPrx = locatorId + ":" + properties->getProperty("IceGrid.Registry.Client.Endpoints"); properties->setProperty("Ice.Default.Locator", locatorPrx); } @@ -493,13 +488,8 @@ NodeService::start(int argc, char* argv[]) AdminPrx admin; try { - const string adminIdProperty = "IceGrid.Registry.AdminIdentity"; - string adminId = properties->getPropertyWithDefault(adminIdProperty, "IceGrid/Admin"); - if(adminId.empty()) - { - const string instanceNameProperty = "IceGrid.InstanceName"; - adminId = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid") + "/Admin"; - } + const string instanceNameProperty = "IceGrid.InstanceName"; + const string adminId = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid") + "/Admin"; admin = AdminPrx::checkedCast(communicator()->stringToProxy(adminId)); } catch(const LocalException& ex) |