Object adapter properties now prefixed by "Ice.OA."

8 files changed, 26 insertions, 25 deletions

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