diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
| commit | d07fdae285690f699a70f97f36232e516dcad2bc (patch) | |
| tree | c239def689c5e6cc53ac76dbe3e60ec11c306964 /cpp/src/IceBox | |
| parent | Fixed tryLock() comment (diff) | |
| download | ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2 ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip | |
Object adapter properties now prefixed by "Ice.OA."
Diffstat (limited to 'cpp/src/IceBox')
| -rw-r--r-- | cpp/src/IceBox/Admin.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index ce9855b64d3..4ca832c154d 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -92,10 +92,15 @@ Client::run(int argc, char* argv[]) string managerProxy; if(properties->getProperty("Ice.Default.Locator").empty()) { - string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints"); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + string managerEndpoints = + properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints", + properties->getProperty("IceBox.ServiceManager.Endpoints")); if(managerEndpoints.empty()) { - cerr << appName() << ": property `IceBox.ServiceManager.Endpoints' is not set" << endl; + cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.Endpoints' is not set" << endl; return EXIT_FAILURE; } @@ -103,10 +108,15 @@ Client::run(int argc, char* argv[]) } else { - string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId"); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + string managerAdapterId = + properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId", + properties->getProperty("IceBox.ServiceManager.AdapterId")); if(managerAdapterId.empty()) { - cerr << appName() << ": property `IceBox.ServiceManager.AdapterId' is not set" << endl; + cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.AdapterId' is not set" << endl; return EXIT_FAILURE; } |