diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-08-24 20:14:12 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-08-24 20:14:12 +0000 |
| commit | 61298308fd59b836cd3bc83f8af0125f1246225d (patch) | |
| tree | 06157f49cc4e3308b41c03e4ee5c80047954595a /cpp | |
| parent | adding debug (diff) | |
| download | ice-61298308fd59b836cd3bc83f8af0125f1246225d.tar.bz2 ice-61298308fd59b836cd3bc83f8af0125f1246225d.tar.xz ice-61298308fd59b836cd3bc83f8af0125f1246225d.zip | |
bug 1156: removing deprecated Identity properties
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Glacier2/router/Client.cpp | 8 | ||||
| -rwxr-xr-x | cpp/test/Glacier2/router/run.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index 63cf69a9fb3..14f41a8ef97 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -85,7 +85,7 @@ public: void run() { CommunicatorPtr communicator = initialize(initData); - ObjectPrx routerBase = communicator->stringToProxy("abc/def:default -p 12347 -t 10000"); + ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347 -t 10000"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); communicator->setDefaultRouter(router); @@ -192,7 +192,7 @@ public: void run() { CommunicatorPtr communicator = initialize(initData); - ObjectPrx routerBase = communicator->stringToProxy("abc/def:default -p 12347 -t 30000"); + ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347 -t 30000"); _router = Glacier2::RouterPrx::checkedCast(routerBase); communicator->setDefaultRouter(_router); @@ -437,7 +437,7 @@ CallbackClient::run(int argc, char* argv[]) { cout << "testing stringToProxy for router... " << flush; - routerBase = communicator()->stringToProxy("abc/def:default -p 12347 -t 10000"); + routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000"); cout << "ok" << endl; } @@ -865,7 +865,7 @@ CallbackClient::run(int argc, char* argv[]) { cout << "testing stringToProxy for admin object... " << flush; - adminBase = communicator()->stringToProxy("ABC/DEF:tcp -h 127.0.0.1 -p 12348 -t 10000"); + adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000"); cout << "ok" << endl; } diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index 7b10a5b089b..99f01dd0ca9 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -28,8 +28,6 @@ command = router + TestUtil.clientServerOptions + \ r' --Glacier2.AllowCategories="c1 c2"' + \ r' --Glacier2.AddUserToAllowCategories="2"' + \ r' --Glacier2.SessionTimeout="30"' + \ - r' --Glacier2.RouterIdentity="abc/def"' + \ - r' --Glacier2.AdminIdentity="ABC/DEF"' + \ r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ |