diff options
Diffstat (limited to 'cpp/test')
64 files changed, 120 insertions, 120 deletions
diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index be0eb01bc24..cc96dbaf927 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -50,7 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); + communicator->getProperties()->setProperty("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 be0eb01bc24..cc96dbaf927 100644 --- a/cpp/test/Freeze/oldevictor/Server.cpp +++ b/cpp/test/Freeze/oldevictor/Server.cpp @@ -50,7 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); + communicator->getProperties()->setProperty("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/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 87eb2268cb5..990d8193eb4 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("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 c4c85daafdd..37031621fb2 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' --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.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --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/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp index c40fa198d0c..0d5f292e9c9 100755 --- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/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("Ice.OA.TestControllerAdapter.Endpoints", "tcp -p 12013"); + communicator()->getProperties()->setProperty("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("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010"); + communicator()->getProperties()->setProperty("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("Ice.OA.BackendAdapter.Endpoints", "default -p 12012"); + communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "default -p 12012"); ObjectAdapterPtr backendAdapter = communicator()->createObjectAdapter("BackendAdapter"); backendAdapter->addServantLocator(new ServantLocatorI(backend), ""); backendAdapter->activate(); diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py index a4c8dd1ebad..daa7efd396a 100755 --- a/cpp/test/Glacier2/dynamicFiltering/run.py +++ b/cpp/test/Glacier2/dynamicFiltering/run.py @@ -34,9 +34,9 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - 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' --Ice.OA.Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \ + r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Glacier2.Server.Endpoints="default -p 12349 -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 afda833a376..4bd95274bb9 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("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 36ff4caed5d..b54ebe0c3c4 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' --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.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' --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 8a0d19cb148..45f48227294 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("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 7cc29d5fc31..bac9cd799c0 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -34,9 +34,9 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - 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' --Ice.OA.Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \ + r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \ + r' --Glacier2.Server.Endpoints="default -p 12349 -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 627efff9342..93b9e4ea635 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' --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.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' --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/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp index e12ef11ac56..4e1e0c3caa3 100644 --- a/cpp/test/Glacier2/staticFiltering/Server.cpp +++ b/cpp/test/Glacier2/staticFiltering/Server.cpp @@ -127,10 +127,10 @@ int BackendServer::run(int argc, char* argv[]) { string endpoints = - communicator()->getProperties()->getPropertyWithDefault("Ice.OA.BackendAdapter.Endpoints", + communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", "tcp -p 12010 -t 20000:ssl -p 12011 -t 20000"); - communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", endpoints); + communicator()->getProperties()->setProperty("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/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py index efbd59a5456..fea6ee0badb 100755 --- a/cpp/test/Glacier2/staticFiltering/run.py +++ b/cpp/test/Glacier2/staticFiltering/run.py @@ -258,8 +258,8 @@ for testcase in testcases: serverOptions = TestUtil.serverProtocol + commonServerOptions routerCmd = router + serverOptions + " --Ice.Config=%s" % os.path.join(testdir, "router.cfg") + \ - 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.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/staticFiltering/passwords"' routerConfig = file(os.path.join(testdir, "router.cfg"), "w") @@ -301,7 +301,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("Ice.OA.BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") + serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") serverConfig.close() serverCmd = os.path.join(testdir, 'server') + serverOptions diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 3419752ac1d..eb3d96ac328 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 234a21708c8..14a03ec086b 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("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 ca6e34b3b7d..f0e882fb3c7 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 8407ebff887..28733b6af4e 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -20,7 +20,7 @@ RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpo Ice::CommunicatorPtr com = current.adapter->getCommunicator(); if(com->getProperties()->getPropertyAsIntWithDefault("Ice.ThreadPerConnection", 0) == 0) { - com->getProperties()->setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); + com->getProperties()->setProperty( 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 261564c6ca8..a568c56c84c 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 b7da06a2c82..5811f081c9b 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("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 15ef0f01bf9..2d38860ce4e 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("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 d4ccd779899..0090d191458 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("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 95009807260..2787dd81015 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("Ice.OA.TestAdapter0.Endpoints", "default"); + communicator->getProperties()->setProperty("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("Ice.OA.TestAdapter0.Endpoints") == "default"); + test(communicator->getProperties()->getProperty("TestAdapter0.Endpoints") == "default"); first->deactivate(); } cout << "ok" << endl; cout << "testing servant registration exceptions... " << flush; { - communicator->getProperties()->setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); + communicator->getProperties()->setProperty("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("Ice.OA.TestAdapter2.Endpoints", "default"); + communicator->getProperties()->setProperty("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 19b9b0eff09..f261e28ef45 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 a21d497727d..6aa10af94c1 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 cb58072e087..a738f18cf6a 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 34090065ae0..bff0436b233 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("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); + communicator->getProperties()->setProperty("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 f1f5a14040a..76dd042beb0 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 34c8d3a10c7..5d732315ee2 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 089190cee08..c50cc24b784 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("Ice.OA.TestAdapter.Endpoints", endpts.str()); + communicator->getProperties()->setProperty("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 ba0dfe8fbba..cbf2c42d929 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 215c3a5e3b6..6ce61c5bb85 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 a28e1fa33a8..c25a0e15066 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 e327819beb1..4288b1c65a8 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("Ice.OA.ServerManager.Endpoints", "default -p 12010:udp"); + properties->setProperty("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 d5f22b48672..e9f2031a03e 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("Ice.OA.TestAdapter.Endpoints", "default"); - _initData.properties->setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter"); - _initData.properties->setProperty("Ice.OA.TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); + _initData.properties->setProperty("TestAdapter.Endpoints", "default"); + _initData.properties->setProperty("TestAdapter.AdapterId", "TestAdapter"); + _initData.properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); - _initData.properties->setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); - _initData.properties->setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2"); + _initData.properties->setProperty("TestAdapter2.Endpoints", "default"); + _initData.properties->setProperty("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 ed26a370e30..aefff553880 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 25379cd3be7..ccffce2c338 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 784cee66f14..1a6af6b7876 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 85979d7424f..f78fda34785 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 0cac6d02a18..adfbac159bc 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 2fc3aa5d171..788ed2ec50b 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index 53348a0799e..d9b0fa5d300 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -65,7 +65,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); adapter->addServantLocator(new ServantLocatorI(""), ""); adapter->addServantLocator(new ServantLocatorI("category"), "category"); diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index 8777fcd5135..68348699177 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index 470a67c51c7..c52bedbec23 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 697d3b3cbfa..044dfafe302 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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 16190251017..6b9bb7dea43 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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 697d3b3cbfa..044dfafe302 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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 16190251017..6b9bb7dea43 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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/threads/Server.cpp b/cpp/test/Ice/threads/Server.cpp index 2685ccf6064..e403e700b25 100644 --- a/cpp/test/Ice/threads/Server.cpp +++ b/cpp/test/Ice/threads/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("server"); adapter->add(new ServerI(communicator), id); diff --git a/cpp/test/Ice/threads/TestI.cpp b/cpp/test/Ice/threads/TestI.cpp index 3520d56263c..a6e00f1b1c0 100644 --- a/cpp/test/Ice/threads/TestI.cpp +++ b/cpp/test/Ice/threads/TestI.cpp @@ -231,8 +231,8 @@ ServerI::ServerI(const Ice::CommunicatorPtr& communicator) // id.properties = communicator->getProperties()->clone(); id.properties->setProperty("Ice.ThreadPerConnection", "1"); - id.properties->setProperty("Ice.OA.Adapter3.ThreadPool.SizeMax", "2"); - id.properties->setProperty("Ice.OA.Adapter3.ThreadPool.SizeWarn", "0"); + id.properties->setProperty("Adapter3.ThreadPool.SizeMax", "2"); + id.properties->setProperty("Adapter3.ThreadPool.SizeWarn", "0"); comm = Ice::initialize(id); adapter = comm->createObjectAdapterWithEndpoints("Adapter3", "default"); ident = comm->stringToIdentity("adapter3"); @@ -247,7 +247,7 @@ ServerI::ServerI(const Ice::CommunicatorPtr& communicator) id.properties->setProperty("Ice.ThreadPerConnection", "0"); id.properties->setProperty("Ice.ThreadPool.Server.SizeMax", "2"); id.properties->setProperty("Ice.ThreadPool.Server.SizeWarn", "0"); - id.properties->setProperty("Ice.OA.Adapter4.ThreadPerConnection", "1"); + id.properties->setProperty("Adapter4.ThreadPerConnection", "1"); comm = Ice::initialize(id); adapter = comm->createObjectAdapterWithEndpoints("Adapter4", "default"); ident = comm->stringToIdentity("adapter4"); diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index cd1d2159c86..44f8c7be0e9 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 9c43011dddb..8e68bcc2b3b 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="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.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="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 8822d7c2dd0..91b492dbc96 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="Ice.OA.IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Ice.OA.IcePatch2.Admin.RegisterProcess" value="1"/> + <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="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/replicaGroup/TestI.cpp b/cpp/test/IceGrid/replicaGroup/TestI.cpp index e0a85fbc86e..2b395914c59 100644 --- a/cpp/test/IceGrid/replicaGroup/TestI.cpp +++ b/cpp/test/IceGrid/replicaGroup/TestI.cpp @@ -19,12 +19,12 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const Ice::PropertiesPtr& pro std::string TestI::getReplicaId(const Ice::Current&) { - return _properties->getProperty("Ice.OA." + _adapter->getName() + ".AdapterId"); + return _properties->getProperty(_adapter->getName() + ".AdapterId"); } std::string TestI::getReplicaIdAndShutdown(const Ice::Current&) { _adapter->getCommunicator()->shutdown(); - return _properties->getProperty("Ice.OA." + _adapter->getName() + ".AdapterId"); + return _properties->getProperty(_adapter->getName() + ".AdapterId"); } diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 2ebf0731d48..3360ca70664 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -920,7 +920,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "Ice.OA.TestAdapter.Endpoints"; + property.name = "TestAdapter.Endpoints"; property.value = "default"; server->propertySet.properties.push_back(property); property.name = "Identity"; @@ -1092,7 +1092,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "Ice.OA.TestAdapter.Endpoints"; + property.name = "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 b0b1c2fad64..abcf5d4e1d4 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="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.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="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 75b2e6b6031..a74466ac0e6 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1651,7 +1651,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, "Ice.OA.IceGrid.Node.Endpoints", "default"); +// addProperty(server, "IceGrid.Node.Endpoints", "default"); // NodeDescriptor node; // node.servers.push_back(server); // nodeApp.nodes["localnode"] = node; @@ -1782,7 +1782,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, "Ice.OA.IceGrid.Node.Endpoints", "default"); + addProperty(server, "IceGrid.Node.Endpoints", "default"); NodeDescriptor node; node.servers.push_back(server); nodeApp.nodes["localnode"] = node; @@ -1832,7 +1832,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = true; adapter.serverLifetime = true; server->adapters.push_back(adapter); - addProperty(server, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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 707c3e33bb6..ddc726028a2 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="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.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="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 adda46062b3..20993bfd697 100755 --- a/cpp/test/IceGrid/simple/run.py +++ b/cpp/test/IceGrid/simple/run.py @@ -26,8 +26,8 @@ name = os.path.join("IceGrid", "simple") # # Test client/server without on demand activation. # -IceGridAdmin.iceGridClientServerTest(name, "", "--Ice.OA.TestAdapter.Endpoints=default" + \ - " --Ice.OA.TestAdapter.AdapterId=TestAdapter") +IceGridAdmin.iceGridClientServerTest(name, "", "--TestAdapter.Endpoints=default" + \ + " --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 37ceba2b818..4d8c7e80837 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, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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, "Ice.OA.${service}.Endpoints", "default"); + addProperty(service, "${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, "Ice.OA.IceGrid.Node.Endpoints", "default"); + addProperty(server, "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, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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 b9978ab4b31..251d5605a87 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("Ice.OA.TestAdapter.Endpoints", "tcp -p 12010"); + communicator->getProperties()->setProperty("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 e1e472bc68e..c7763662b2b 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 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" + \ " --IceBox.InheritProperties=1" 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 92ec55a1f4d..30b9b88df04 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -29,22 +29,22 @@ iceBox = TestUtil.getIceBox(exedir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12012"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12012"' + \ ' --IceStorm.InstanceName=TestIceStorm1 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ " --IceBox.InheritProperties=1" iceStormReference = ' --IceStorm.TopicManager.Proxy="TestIceStorm1/TopicManager: default -p 12011"' -iceBoxEndpoints2 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' +iceBoxEndpoints2 = ' --IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' iceStormService2 = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12021"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12022"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12021"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12022"' + \ ' --IceStorm.InstanceName=TestIceStorm2 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index d99b572faf6..4ba3958218d 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 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default:udp"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default:udp"' + \ " --IceBox.PrintServicesReady=IceStorm" + \ " --IceBox.InheritProperties=1" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"' diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index 503a4e89dc7..3df7e333cea 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -29,22 +29,22 @@ iceBox = TestUtil.getIceBox(exedir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12012"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12012"' + \ ' --IceStorm.InstanceName=TestIceStorm1 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ " --IceBox.InheritProperties=1" iceStormReference = ' --IceStorm.TopicManager.Proxy="TestIceStorm1/TopicManager: default -p 12011"' -iceBoxEndpoints2 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' +iceBoxEndpoints2 = ' --IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' iceStormService2 = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12021"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12022"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12021"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12022"' + \ ' --IceStorm.InstanceName=TestIceStorm2 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ |