diff options
Diffstat (limited to 'cpp/test')
57 files changed, 100 insertions, 101 deletions
diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index f7d1010966a..dde935ffd7f 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -50,8 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000"); - + communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName); diff --git a/cpp/test/Freeze/oldevictor/Server.cpp b/cpp/test/Freeze/oldevictor/Server.cpp index f7d1010966a..dde935ffd7f 100644 --- a/cpp/test/Freeze/oldevictor/Server.cpp +++ b/cpp/test/Freeze/oldevictor/Server.cpp @@ -50,8 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000"); - + communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName); diff --git a/cpp/test/Glacier2/addressFilter/Server.cpp b/cpp/test/Glacier2/addressFilter/Server.cpp index 29c63d6e017..6d9a85611e6 100644 --- a/cpp/test/Glacier2/addressFilter/Server.cpp +++ b/cpp/test/Glacier2/addressFilter/Server.cpp @@ -127,10 +127,10 @@ int BackendServer::run(int argc, char* argv[]) { string endpoints = - communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", + communicator()->getProperties()->getPropertyWithDefault("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 20000:ssl -p 12011 -t 20000"); - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints); + communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", endpoints); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); BackendPtr backend = new BackendI; Ice::LocatorPtr locator = new ServerLocatorI(backend, adapter); diff --git a/cpp/test/Glacier2/addressFilter/run.py b/cpp/test/Glacier2/addressFilter/run.py index db150dda5b3..cdd1d578fd1 100755 --- a/cpp/test/Glacier2/addressFilter/run.py +++ b/cpp/test/Glacier2/addressFilter/run.py @@ -248,8 +248,8 @@ for testcase in testcases: serverOptions = TestUtil.serverProtocol + commonServerOptions routerCmd = router + serverOptions + " --Ice.Config=%s" % os.path.join(testdir, "router.cfg") + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/addressFilter/passwords"' routerConfig = file(os.path.join(testdir, "router.cfg"), "w") @@ -291,7 +291,7 @@ for testcase in testcases: if TestUtil.protocol != "ssl": serverConfig = file(os.path.join(testdir, "server.cfg"), "w") serverOptions = ' --Ice.Config=' + os.path.join(testdir, "server.cfg") + " " + serverOptions - serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") + serverConfig.write("Ice.OA.BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") serverConfig.close() serverCmd = os.path.join(testdir, 'server') + serverOptions diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 1ea110d43a5..d53d7dddc21 100644 --- a/cpp/test/Glacier2/attack/Server.cpp +++ b/cpp/test/Glacier2/attack/Server.cpp @@ -58,7 +58,7 @@ main(int argc, char* argv[]) int BackendServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); adapter->addServantLocator(new ServantLocatorI, ""); adapter->activate(); diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index a0b701f0a38..8989be68548 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/run.py @@ -24,8 +24,8 @@ router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ r' --Glacier2.RoutingTable.MaxSize=10' + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"' print "starting router...", diff --git a/cpp/test/Glacier2/filters/Server.cpp b/cpp/test/Glacier2/filters/Server.cpp index 569c793d17f..19adc85d237 100755 --- a/cpp/test/Glacier2/filters/Server.cpp +++ b/cpp/test/Glacier2/filters/Server.cpp @@ -139,19 +139,19 @@ SessionControlServer::run(int, char*[]) // servant, allowing us to use any reference as long as the client // expects to use a proxy for the correct type of object. // - communicator()->getProperties()->setProperty("TestControllerAdapter.Endpoints", "tcp -p 12013"); + communicator()->getProperties()->setProperty("Ice.OA.TestControllerAdapter.Endpoints", "tcp -p 12013"); ObjectAdapterPtr controllerAdapter = communicator()->createObjectAdapter("TestControllerAdapter"); TestControllerIPtr controller = new TestControllerI; controllerAdapter->add(controller, communicator()->stringToIdentity("testController")); controllerAdapter->activate(); - communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010"); + communicator()->getProperties()->setProperty("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); adapter->add(new SessionManagerI(controller), communicator()->stringToIdentity("SessionManager")); adapter->activate(); BackendPtr backend = new BackendI; - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "default -p 12012"); + communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", "default -p 12012"); ObjectAdapterPtr backendAdapter = communicator()->createObjectAdapter("BackendAdapter"); backendAdapter->addServantLocator(new ServantLocatorI(backend), ""); backendAdapter->activate(); diff --git a/cpp/test/Glacier2/filters/run.py b/cpp/test/Glacier2/filters/run.py index 7018fd7177a..bfa651a14d1 100755 --- a/cpp/test/Glacier2/filters/run.py +++ b/cpp/test/Glacier2/filters/run.py @@ -34,8 +34,8 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' + \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ r' --Ice.Default.Locator="locator:default -h 127.0.0.1 -p 12012 -t 10000"' diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp index 6ab68f2e12b..6c552094dc5 100644 --- a/cpp/test/Glacier2/router/Server.cpp +++ b/cpp/test/Glacier2/router/Server.cpp @@ -37,7 +37,7 @@ main(int argc, char* argv[]) int CallbackServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); adapter->add(new CallbackI(), communicator()->stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter->add(new CallbackI(), communicator()->stringToIdentity("c2/callback")); // The test allows "c2" as category. diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index b47e59b3c8f..ac1bd1478b9 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -28,9 +28,9 @@ command = router + TestUtil.clientServerOptions + \ r' --Glacier2.Filter.Category.Accept="c1 c2"' + \ r' --Glacier2.Filter.Category.AcceptUser="2"' + \ r' --Glacier2.SessionTimeout="30"' + \ - 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"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/router/passwords"' print "starting router...", diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp index df45e98804e..7e83e195adf 100644 --- a/cpp/test/Glacier2/sessionControl/Server.cpp +++ b/cpp/test/Glacier2/sessionControl/Server.cpp @@ -32,7 +32,7 @@ main(int argc, char* argv[]) int SessionControlServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); adapter->add(new SessionManagerI, communicator()->stringToIdentity("SessionManager")); adapter->activate(); diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py index 477a6ec050e..edcb81d07e1 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -34,8 +34,8 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \ r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index 551b0802c25..860d1797694 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -36,9 +36,9 @@ router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ r' --Ice.Warn.Dispatch=0' + \ r' --Glacier2.AddSSLContext=1' + \ - r' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -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 12349 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \ r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 8065b379527..017587fb46f 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -33,7 +33,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); ServantLocatorPtr locator = new ServantLocatorI; adapter->addServantLocator(locator, ""); diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index 77403ccb17f..39e195dc761 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -31,7 +31,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); ServantLocatorPtr locator = new ServantLocatorI; diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index 62b9802d960..4d2ac618001 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("communicator"); adapter->add(new RemoteCommunicatorI(), id); diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index 89e6709a59c..6f67ec0bf9a 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -18,7 +18,7 @@ RemoteObjectAdapterPrx RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpoints, const Current& current) { Ice::CommunicatorPtr com = current.adapter->getCommunicator(); - com->getProperties()->setProperty(name + ".ThreadPool.Size", "1"); + com->getProperties()->setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); ObjectAdapterPtr adapter = com->createObjectAdapterWithEndpoints(name, endpoints); return RemoteObjectAdapterPrx::uncheckedCast(current.adapter->addWithUUID(new RemoteObjectAdapterI(adapter))); } diff --git a/cpp/test/Ice/checksum/server/Server.cpp b/cpp/test/Ice/checksum/server/Server.cpp index f6e4e4a6fa2..5a20b900881 100644 --- a/cpp/test/Ice/checksum/server/Server.cpp +++ b/cpp/test/Ice/checksum/server/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ChecksumI(adapter); adapter->add(object, communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index f4a5f3e13f1..a6571401b9a 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index ada96ddd009..d7f043244a7 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -39,7 +39,7 @@ main(int argc, char** argv) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index d194fe648f0..0714154a4dd 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 4d361e6a85a..5b3994f87b2 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -583,7 +583,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Expected } - communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter0.Endpoints", "default"); first = communicator->createObjectAdapter("TestAdapter0"); try { @@ -608,14 +608,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // // Properties must remain unaffected if an exception occurs. // - test(communicator->getProperties()->getProperty("TestAdapter0.Endpoints") == "default"); + test(communicator->getProperties()->getProperty("Ice.OA.TestAdapter0.Endpoints") == "default"); first->deactivate(); } cout << "ok" << endl; cout << "testing servant registration exceptions... " << flush; { - communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); Ice::ObjectPtr obj = new EmptyI; adapter->add(obj, communicator->stringToIdentity("x")); @@ -644,7 +644,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "testing servant locator registrations exceptions... " << flush; { - communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter2"); Ice::ServantLocatorPtr loc = new ServantLocatorI; adapter->addServantLocator(loc, "x"); diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index e707b049918..f361425cde0 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 26b3c89f181..75cb76c8793 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 99ebdb2b845..e8d7546e23d 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 33e126a37d6..41805b7bca9 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -22,7 +22,7 @@ GPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing facet registration exceptions... " << flush; - communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); Ice::ObjectPtr obj = new EmptyI; adapter->add(obj, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 5038f1bf054..5450f01f22a 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = new DI; adapter->add(d, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index fc71f95c9a0..cef1f93d2ed 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = new DI; adapter->add(d, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index 6c7c05832b3..cbc5a9db94c 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -50,7 +50,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) ostringstream endpts; endpts << "default -p " << port << ":udp"; - communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpts.str()); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", endpts.str()); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index 9a0c81a34fe..397af86e266 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new HoldI; adapter->add(object, communicator->stringToIdentity("hold")); diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 7b169147632..266d482f833 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index 6fd5e31ca36..80e7879d72f 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index e141e427e07..e03b57c4270 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -24,7 +24,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, // Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.ThreadPool.Server.Size", "2"); - properties->setProperty("ServerManager.Endpoints", "default -p 12010:udp"); + properties->setProperty("Ice.OA.ServerManager.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ServerManager"); diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 45cd666fb86..a36610ef230 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -18,12 +18,12 @@ ServerManagerI::ServerManagerI(const Ice::ObjectAdapterPtr& adapter, const Ice::InitializationData& initData) : _adapter(adapter), _registry(registry), _initData(initData) { - _initData.properties->setProperty("TestAdapter.Endpoints", "default"); - _initData.properties->setProperty("TestAdapter.AdapterId", "TestAdapter"); - _initData.properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); + _initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default"); + _initData.properties->setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter"); + _initData.properties->setProperty("Ice.OA.TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); - _initData.properties->setProperty("TestAdapter2.Endpoints", "default"); - _initData.properties->setProperty("TestAdapter2.AdapterId", "TestAdapter2"); + _initData.properties->setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); + _initData.properties->setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2"); _initData.properties->setProperty("Ice.PrintAdapterReady", "0"); } diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 8b9bbc387cb..6e9531793d5 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); InitialPtr initial = new InitialI(adapter); adapter->add(initial, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 88343fa15f9..2b24c724a1a 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); InitialPtr initial = new InitialI(adapter); adapter->add(initial, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 58a734b368c..ddc5542f202 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -16,7 +16,7 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("test"); adapter->add(new MyDerivedClassI(adapter, id), id); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 7e782503d4a..5df8f4beac8 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("test"); adapter->add(new MyDerivedClassI(adapter, id), id); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index 084eaeff6d9..51897e71501 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("test"); adapter->add(new MyDerivedClassI(adapter, id), id); diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index fcd856114f9..2586732b4d1 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new RetryI; adapter->add(object, communicator->stringToIdentity("retry")); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index f7148f82603..e9852c502b7 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp index f505ad08971..0b3d6a1af08 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index f7148f82603..e9852c502b7 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index f505ad08971..0b3d6a1af08 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index b4da1eb153d..6c2d1c53a5d 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TimeoutI; adapter->add(object, communicator->stringToIdentity("timeout")); diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml index 8e68bcc2b3b..9c43011dddb 100644 --- a/cpp/test/IceGrid/allocation/application.xml +++ b/cpp/test/IceGrid/allocation/application.xml @@ -9,10 +9,10 @@ <parameter name="manager"/> <server id="${id}" exe="${ice.dir}/bin/glacier2router"> - <property name="Glacier2.Client.Endpoints" value="${endpoints}"/> - <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.Glacier2.Client.Endpoints" value="${endpoints}"/> + <property name="Ice.OA.Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.RegisterProcess" value="1"/> <property name="Glacier2.SessionManager" value="${manager}"/> <property name="Glacier2.SSLSessionManager" value="IceGrid/SSLSessionManager"/> diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml index 91b492dbc96..8822d7c2dd0 100644 --- a/cpp/test/IceGrid/distribution/application.xml +++ b/cpp/test/IceGrid/distribution/application.xml @@ -16,8 +16,8 @@ <object identity="${instance-name}/server" type="::IcePatch2::FileServer"/> </adapter> <properties> - <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="IcePatch2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.IcePatch2.Admin.RegisterProcess" value="1"/> <property name="IcePatch2.InstanceName" value="${instance-name}"/> <property name="IcePatch2.Directory" value="${directory}"/> </properties> diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index d7be7246922..5f728712bb0 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -906,7 +906,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "TestAdapter.Endpoints"; + property.name = "Ice.OA.TestAdapter.Endpoints"; property.value = "default"; server->propertySet.properties.push_back(property); property.name = "Identity"; @@ -1078,7 +1078,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "TestAdapter.Endpoints"; + property.name = "Ice.OA.TestAdapter.Endpoints"; property.value = "default"; server->propertySet.properties.push_back(property); property.name = "Identity"; diff --git a/cpp/test/IceGrid/replication/application.xml b/cpp/test/IceGrid/replication/application.xml index abcf5d4e1d4..b0b1c2fad64 100644 --- a/cpp/test/IceGrid/replication/application.xml +++ b/cpp/test/IceGrid/replication/application.xml @@ -31,10 +31,10 @@ <dbproperty name="set_flags" value="DB_TXN_NOSYNC"/> </dbenv> <property name="IceGrid.InstanceName" value="TestIceGrid"/> - <property name="IceGrid.Registry.Client.Endpoints" value="default -h 127.0.0.1 -p ${port}"/> - <property name="IceGrid.Registry.Server.Endpoints" value="default"/> - <property name="IceGrid.Registry.Internal.Endpoints" value="default"/> - <property name="IceGrid.Registry.SessionManager.Endpoints" value="default"/> + <property name="Ice.OA.IceGrid.Registry.Client.Endpoints" value="default -h 127.0.0.1 -p ${port}"/> + <property name="Ice.OA.IceGrid.Registry.Server.Endpoints" value="default"/> + <property name="Ice.OA.IceGrid.Registry.Internal.Endpoints" value="default"/> + <property name="Ice.OA.IceGrid.Registry.SessionManager.Endpoints" value="default"/> <property name="IceGrid.Registry.ReplicaName" value="${replicaName}"/> <property name="IceGrid.Registry.Data" value="${node.datadir}/servers/${server}/dbs/data"/> <property name="IceGrid.Registry.PermissionsVerifier" value="TestIceGrid/NullPermissionsVerifier"/> diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 82f12c4bf53..e40196c5a06 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1657,7 +1657,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // server->adapters.push_back(adapter); // addProperty(server, "IceGrid.Node.Name", "node-1"); // addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-1"); -// addProperty(server, "IceGrid.Node.Endpoints", "default"); +// addProperty(server, "Ice.OA.IceGrid.Node.Endpoints", "default"); // NodeDescriptor node; // node.servers.push_back(server); // nodeApp.nodes["localnode"] = node; @@ -1789,7 +1789,7 @@ allTests(const Ice::CommunicatorPtr& communicator) server->adapters.push_back(adapter); addProperty(server, "IceGrid.Node.Name", "node-1"); addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-1"); - addProperty(server, "IceGrid.Node.Endpoints", "default"); + addProperty(server, "Ice.OA.IceGrid.Node.Endpoints", "default"); NodeDescriptor node; node.servers.push_back(server); nodeApp.nodes["localnode"] = node; @@ -1839,7 +1839,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = true; adapter.serverLifetime = true; server->adapters.push_back(adapter); - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); node = NodeDescriptor(); node.servers.push_back(server); testApp.nodes["localnode"] = node; diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml index ddc726028a2..707c3e33bb6 100644 --- a/cpp/test/IceGrid/session/application.xml +++ b/cpp/test/IceGrid/session/application.xml @@ -10,10 +10,10 @@ <parameter name="ssl-manager"/> <server id="${id}" exe="${ice.dir}/bin/glacier2router"> - <property name="Glacier2.Client.Endpoints" value="${endpoints}"/> - <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.Glacier2.Client.Endpoints" value="${endpoints}"/> + <property name="Ice.OA.Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.RegisterProcess" value="1"/> <property name="Glacier2.SessionManager" value="${manager}"/> <property name="Glacier2.SSLSessionManager" value="${ssl-manager}"/> diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py index 41ba6654786..8b24f64d7ed 100755 --- a/cpp/test/IceGrid/simple/run.py +++ b/cpp/test/IceGrid/simple/run.py @@ -26,7 +26,8 @@ name = os.path.join("IceGrid", "simple") # # Test client/server without on demand activation. # -IceGridAdmin.iceGridClientServerTest(name, "", "--TestAdapter.Endpoints=default --TestAdapter.AdapterId=TestAdapter") +IceGridAdmin.iceGridClientServerTest(name, "", "--Ice.OA.TestAdapter.Endpoints=default" + \ + " --Ice.OA.TestAdapter.AdapterId=TestAdapter") # # Test client/server with on demand activation. diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index b64a55b00a0..84caf0120b5 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -152,7 +152,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.name = "Server"; adapter.id = "ServerAdapter"; adapter.registerProcess = true; - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); ObjectDescriptor object; object.id = communicator->stringToIdentity("test"); object.type = "::Test::TestIntf"; @@ -215,7 +215,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.name = "Server"; adapter.id = "${server}"; adapter.registerProcess = true; - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); object = ObjectDescriptor(); object.id = communicator->stringToIdentity("${server}"); object.type = "::Test::TestIntf"; @@ -486,7 +486,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.name = "${service}"; adapter.id = "${server}.${service}"; adapter.registerProcess = true; - addProperty(service, "${service}.Endpoints", "default"); + addProperty(service, "Ice.OA.${service}.Endpoints", "default"); service->adapters.push_back(adapter); IceBoxDescriptorPtr server = new IceBoxDescriptor(); @@ -1042,7 +1042,7 @@ allTests(const Ice::CommunicatorPtr& communicator) addProperty(server, "IceGrid.Node.Name", "node-${index}"); addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-${index}"); - addProperty(server, "IceGrid.Node.Endpoints", "default"); + addProperty(server, "Ice.OA.IceGrid.Node.Endpoints", "default"); addProperty(server, "IceGrid.Node.PropertiesOverride", properties->getProperty("NodePropertiesOverride")); nodeApp.serverTemplates["nodeTemplate"].descriptor = server; @@ -1103,7 +1103,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = true; adapter.serverLifetime = true; server->adapters.push_back(adapter); - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); testApp.nodes["node-1"].servers.push_back(server); try diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp index 7d0c5a5f80e..93ce6a25fc8 100644 --- a/cpp/test/IceSSL/configuration/Server.cpp +++ b/cpp/test/IceSSL/configuration/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "tcp -p 12010"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "tcp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("factory"); adapter->add(new ServerFactoryI, id); diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 0c2e827422f..4f61b179a76 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -28,11 +28,11 @@ iceBox = TestUtil.getIceBox(testdir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --IceStorm.Publish.Endpoints="default"' + \ + ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"' diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index bd7754d34c3..301b6535288 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -30,11 +30,11 @@ iceBox = TestUtil.getIceBox(exedir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --IceStorm.Publish.Endpoints="default"' + \ + ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"' diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index 002f3b0c9c3..558b936a89e 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -28,11 +28,11 @@ iceBox = TestUtil.getIceBox(testdir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --IceStorm.Publish.Endpoints="default"' + \ + ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"' |