diff options
Diffstat (limited to 'cpp/test/IceGrid/session')
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 6 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/application.xml | 8 |
2 files changed, 7 insertions, 7 deletions
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}"/> |