diff options
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index c23e68edc10..b90bdf0c210 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -227,13 +227,22 @@ NodeService::start(int argc, char* argv[]) out << "you should set individual adapter thread pools instead."; } - int size = properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.Size", 0); + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + int size = properties->getPropertyAsIntWithDefault("Ice.OA.IceGrid.Node.ThreadPool.Size", + properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.Size", 0)); if(size <= 0) { - properties->setProperty("IceGrid.Node.ThreadPool.Size", "1"); + properties->setProperty("Ice.OA.IceGrid.Node.ThreadPool.Size", "1"); size = 1; } - int sizeMax = properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.SizeMax", 0); + + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + int sizeMax = properties->getPropertyAsIntWithDefault("Ice.OA.IceGrid.Node.ThreadPool.SizeMax", + properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.SizeMax", 0)); if(sizeMax <= 0) { if(size >= sizeMax) @@ -243,7 +252,7 @@ NodeService::start(int argc, char* argv[]) ostringstream os; os << sizeMax; - properties->setProperty("IceGrid.Node.ThreadPool.SizeMax", os.str()); + properties->setProperty("Ice.OA.IceGrid.Node.ThreadPool.SizeMax", os.str()); } size = properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Client.Size", 0); @@ -296,8 +305,13 @@ NodeService::start(int argc, char* argv[]) Identity locatorId; locatorId.category = properties->getPropertyWithDefault("IceGrid.InstanceName", "IceGrid"); locatorId.name = "Locator"; - string locatorPrx = "\"" + communicator()->identityToString(locatorId) + "\" :" + - properties->getProperty("IceGrid.Registry.Client.Endpoints"); + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + string endpoints = + properties->getPropertyWithDefault("Ice.OA.IceGrid.Registry.Client.Endpoints", + properties->getProperty("IceGrid.Registry.Client.Endpoints")); + string locatorPrx = "\"" + communicator()->identityToString(locatorId) + "\" :" + endpoints; communicator()->setDefaultLocator(LocatorPrx::uncheckedCast(communicator()->stringToProxy(locatorPrx))); properties->setProperty("Ice.Default.Locator", locatorPrx); } @@ -362,9 +376,12 @@ NodeService::start(int argc, char* argv[]) // // Check that required properties are set and valid. // - if(properties->getProperty("IceGrid.Node.Endpoints").empty()) + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(properties->getProperty("Ice.OA.IceGrid.Node.Endpoints").empty() && + properties->getProperty("IceGrid.Node.Endpoints").empty()) { - error("property `IceGrid.Node.Endpoints' is not set"); + error("property `Ice.OA.IceGrid.Node.Endpoints' is not set"); return false; } @@ -384,7 +401,11 @@ NodeService::start(int argc, char* argv[]) // // Create the node object adapter. // - properties->setProperty("IceGrid.Node.RegisterProcess", "0"); + // DEPRECATED PROPERTIES: Remove extra code in future release. + // + properties->setProperty("Ice.OA.IceGrid.Node.RegisterProcess", "0"); + properties->setProperty("IceGrid.Node.RegisterProcess", ""); + properties->setProperty("Ice.OA.IceGrid.Node.AdapterId", ""); properties->setProperty("IceGrid.Node.AdapterId", ""); _adapter = communicator()->createObjectAdapter("IceGrid.Node"); |