summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/update
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-12-18 17:06:44 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-12-18 17:06:44 +0000
commitd07fdae285690f699a70f97f36232e516dcad2bc (patch)
treec239def689c5e6cc53ac76dbe3e60ec11c306964 /cpp/test/IceGrid/update
parentFixed tryLock() comment (diff)
downloadice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2
ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz
ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip
Object adapter properties now prefixed by "Ice.OA."
Diffstat (limited to 'cpp/test/IceGrid/update')
-rw-r--r--cpp/test/IceGrid/update/AllTests.cpp10
1 files changed, 5 insertions, 5 deletions
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