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

27 files changed, 32 insertions, 32 deletions

diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py
index d725ce0163d..130bcf7901c 100644
--- a/py/test/Ice/adapterDeactivation/Collocated.py
+++ b/py/test/Ice/adapterDeactivation/Collocated.py
@@ -26,7 +26,7 @@ import Test, TestI, AllTests
 
 class TestServer(Ice.Application):
     def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+        self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
         adapter = self.communicator().createObjectAdapter("TestAdapter")
         locator = TestI.ServantLocatorI()
 
diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py
index 668011e0415..53c185cc6e8 100644
--- a/py/test/Ice/adapterDeactivation/Server.py
+++ b/py/test/Ice/adapterDeactivation/Server.py
@@ -26,7 +26,7 @@ import Test, TestI
 
 class TestServer(Ice.Application):
     def run(self, args):
-	self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
+	self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
         adapter = self.communicator().createObjectAdapter("TestAdapter")
         locator = TestI.ServantLocatorI()
 
diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py
index 873b5e1432d..290790b87f9 100644
--- a/py/test/Ice/binding/Server.py
+++ b/py/test/Ice/binding/Server.py
@@ -26,7 +26,7 @@ import Test, TestI
 
 def run(args, communicator):
     communicator.getProperties().setProperty("Ice.Warn.Connections", "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")
     adapter = communicator.createObjectAdapter("TestAdapter")
     id = communicator.stringToIdentity("communicator")
     adapter.add(TestI.RemoteCommunicatorI(), id)
diff --git a/py/test/Ice/binding/TestI.py b/py/test/Ice/binding/TestI.py
index 7081caf468b..dfd5533c599 100644
--- a/py/test/Ice/binding/TestI.py
+++ b/py/test/Ice/binding/TestI.py
@@ -13,7 +13,7 @@ import Ice, Test
 class RemoteCommunicatorI(Test.RemoteCommunicator):
     def createObjectAdapter(self, name, endpoints, current=None):
 	com = current.adapter.getCommunicator()
-	com.getProperties().setProperty(name + ".ThreadPool.Size", "1")
+	com.getProperties().setProperty("Ice.OA." + name + ".ThreadPool.Size", "1")
 	adapter = com.createObjectAdapterWithEndpoints(name, endpoints)
 	return Test.RemoteObjectAdapterPrx.uncheckedCast(current.adapter.addWithUUID(RemoteObjectAdapterI(adapter)))
 
diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py
index 237e2afb8b2..bfcb7de77a2 100644
--- a/py/test/Ice/checksum/Server.py
+++ b/py/test/Ice/checksum/Server.py
@@ -46,7 +46,7 @@ class ChecksumI(Test.Checksum):
         self._adapter.getCommunicator().shutdown()
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = ChecksumI(adapter)
     adapter.add(object, communicator.stringToIdentity("test"))
diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py
index 9282c34333a..6c94e852709 100644
--- a/py/test/Ice/custom/Server.py
+++ b/py/test/Ice/custom/Server.py
@@ -88,7 +88,7 @@ class CustomI(Test.Custom):
         self._adapter.getCommunicator().shutdown()
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = CustomI(adapter)
     adapter.add(object, communicator.stringToIdentity("test"))
diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py
index 438cbdb53f7..c7092d50dfa 100644
--- a/py/test/Ice/exceptions/AllTests.py
+++ b/py/test/Ice/exceptions/AllTests.py
@@ -289,7 +289,7 @@ class AMI_WrongOperation_noSuchOperationI(CallbackBase):
 
 def allTests(communicator):
     print "testing servant registration exceptions... ",
-    communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default")
     adapter = communicator.createObjectAdapter("TestAdapter1")
     obj = EmptyI()
     adapter.add(obj, communicator.stringToIdentity("x"))
@@ -310,7 +310,7 @@ def allTests(communicator):
     print "ok"
 
     print "testing servant locator registrations exceptions... ",
-    communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default")
     adapter = communicator.createObjectAdapter("TestAdapter2")
     loc = ServantLocatorI()
     adapter.addServantLocator(loc, "x")
diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py
index b20b8f69998..8828ef9d93c 100644
--- a/py/test/Ice/exceptions/Collocated.py
+++ b/py/test/Ice/exceptions/Collocated.py
@@ -27,7 +27,7 @@ import Test, TestI, AllTests
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.ThrowerI(adapter)
     adapter.add(object, communicator.stringToIdentity("thrower"))
diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py
index a3cb4d4bd06..d67f51d4740 100644
--- a/py/test/Ice/exceptions/Server.py
+++ b/py/test/Ice/exceptions/Server.py
@@ -27,7 +27,7 @@ import Test, TestI
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.ThrowerI(adapter)
     adapter.add(object, communicator.stringToIdentity("thrower"))
diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py
index 8918b9285a1..c1789f36796 100644
--- a/py/test/Ice/exceptions/ServerAMD.py
+++ b/py/test/Ice/exceptions/ServerAMD.py
@@ -125,7 +125,7 @@ class ThrowerI(Test.Thrower):
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = ThrowerI(adapter)
     adapter.add(object, communicator.stringToIdentity("thrower"))
diff --git a/py/test/Ice/facets/AllTests.py b/py/test/Ice/facets/AllTests.py
index 3fecd56af9f..af289224430 100644
--- a/py/test/Ice/facets/AllTests.py
+++ b/py/test/Ice/facets/AllTests.py
@@ -19,7 +19,7 @@ class EmptyI(Test.Empty):
 
 def allTests(communicator):
     print "testing facet registration exceptions... ",
-    communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default")
+    communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default")
     adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter")
     obj = EmptyI()
     adapter.add(obj, communicator.stringToIdentity("d"))
diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py
index 0a81d3653e3..9a3f6f4aa1d 100644
--- a/py/test/Ice/facets/Collocated.py
+++ b/py/test/Ice/facets/Collocated.py
@@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     d = TestI.DI()
     adapter.add(d, communicator.stringToIdentity("d"))
diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py
index 1048de39eac..4ec016482ce 100644
--- a/py/test/Ice/facets/Server.py
+++ b/py/test/Ice/facets/Server.py
@@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice')
 import Test, TestI
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     d = TestI.DI()
     adapter.add(d, communicator.stringToIdentity("d"))
diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py
index f36f9a81d19..8ff6d736574 100644
--- a/py/test/Ice/faultTolerance/Server.py
+++ b/py/test/Ice/faultTolerance/Server.py
@@ -64,7 +64,7 @@ def run(args, communicator):
         return False
 
     endpts = "default -p " + str(port) + ":udp"
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", endpts)
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", endpts)
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI(adapter)
     adapter.add(object, communicator.stringToIdentity("test"))
diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py
index e51c8dfd6c8..3a1572abb73 100644
--- a/py/test/Ice/inheritance/Collocated.py
+++ b/py/test/Ice/inheritance/Collocated.py
@@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice')
 import Test, TestI, AllTests
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.InitialI(adapter)
     adapter.add(object, communicator.stringToIdentity("initial"))
diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py
index 28556abfa5c..910a2724cbb 100644
--- a/py/test/Ice/inheritance/Server.py
+++ b/py/test/Ice/inheritance/Server.py
@@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice')
 import Test, TestI
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI.InitialI(adapter)
     adapter.add(object, communicator.stringToIdentity("initial"))
diff --git a/py/test/Ice/location/Server.py b/py/test/Ice/location/Server.py
index d6655b3f447..500b7377da9 100644
--- a/py/test/Ice/location/Server.py
+++ b/py/test/Ice/location/Server.py
@@ -85,10 +85,10 @@ class ServerManagerI(Test.ServerManager):
 	self._registry = registry
         self._communicators = []
         self._initData = initData
-        self._initData.properties.setProperty("TestAdapter.Endpoints", "default")
-        self._initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter")
-        self._initData.properties.setProperty("TestAdapter2.Endpoints", "default")
-        self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2")
+        self._initData.properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default")
+        self._initData.properties.setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter")
+        self._initData.properties.setProperty("Ice.OA.TestAdapter2.Endpoints", "default")
+        self._initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2")
 
     def startServer(self, current=None):
       
@@ -154,7 +154,7 @@ def run(args, communicator, initData):
     #
     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")
 
     adapter = communicator.createObjectAdapter("ServerManager")
 
diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py
index b659095829a..0b4be21ab96 100644
--- a/py/test/Ice/objects/Collocated.py
+++ b/py/test/Ice/objects/Collocated.py
@@ -26,7 +26,7 @@ Ice.loadSlice('ClientPrivate.ice')
 import Test, TestI, AllTests
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     initial = TestI.InitialI(adapter)
     adapter.add(initial, communicator.stringToIdentity("initial"))
diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py
index 13f9a2ed4c9..77b66949069 100644
--- a/py/test/Ice/objects/Server.py
+++ b/py/test/Ice/objects/Server.py
@@ -26,7 +26,7 @@ Ice.loadSlice('ServerPrivate.ice')
 import Test, TestI
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     initial = TestI.InitialI(adapter)
     adapter.add(initial, communicator.stringToIdentity("initial"))
diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py
index 823a5bfc14b..d08f38f7986 100644
--- a/py/test/Ice/operations/Collocated.py
+++ b/py/test/Ice/operations/Collocated.py
@@ -35,7 +35,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice')
 import Test, TestI, AllTests
 
 def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     id = communicator.stringToIdentity("test")
     adapter.add(TestI.MyDerivedClassI(adapter, id), id)
diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py
index d3dc430be7f..36ecaea2793 100644
--- a/py/test/Ice/operations/Server.py
+++ b/py/test/Ice/operations/Server.py
@@ -36,7 +36,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice')
 import Test, TestI
 
 def run(args, 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")
     adapter = communicator.createObjectAdapter("TestAdapter")
     id = communicator.stringToIdentity("test")
     adapter.add(TestI.MyDerivedClassI(adapter, id), id)
diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py
index 08a753995c5..6272b646111 100644
--- a/py/test/Ice/operations/ServerAMD.py
+++ b/py/test/Ice/operations/ServerAMD.py
@@ -229,7 +229,7 @@ class TestCheckedCastI(Test.TestCheckedCast):
 	return Test.TestCheckedCast.ice_isA(self, s, current)
 
 def run(args, 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")
     adapter = communicator.createObjectAdapter("TestAdapter")
     id = communicator.stringToIdentity("test")
     adapter.add(MyDerivedClassI(adapter, id), id)
diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py
index b954f1e99f9..0c64dd1f27e 100644
--- a/py/test/Ice/retry/Server.py
+++ b/py/test/Ice/retry/Server.py
@@ -36,7 +36,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice')
 import Test, TestI
 
 def run(args, 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")
     adapter = communicator.createObjectAdapter("TestAdapter")
     id = communicator.stringToIdentity("retry")
     adapter.add(TestI.RetryI(), id)
diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py
index d5ff332b808..4f711ddfa01 100644
--- a/py/test/Ice/slicing/exceptions/Server.py
+++ b/py/test/Ice/slicing/exceptions/Server.py
@@ -117,7 +117,7 @@ class TestI(Test.TestIntf):
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI(adapter)
     adapter.add(object, Ice.stringToIdentity("Test"))
diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/py/test/Ice/slicing/exceptions/ServerAMD.py
index 0c5b3310e2e..ce4f384cb1a 100644
--- a/py/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/py/test/Ice/slicing/exceptions/ServerAMD.py
@@ -118,7 +118,7 @@ class TestI(Test.TestIntf):
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI(adapter)
     adapter.add(object, Ice.stringToIdentity("Test"))
diff --git a/py/test/Ice/slicing/objects/Server.py b/py/test/Ice/slicing/objects/Server.py
index c9199e0c293..90fdeece83d 100644
--- a/py/test/Ice/slicing/objects/Server.py
+++ b/py/test/Ice/slicing/objects/Server.py
@@ -279,7 +279,7 @@ class TestI(Test.TestIntf):
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI(adapter)
     adapter.add(object, Ice.stringToIdentity("Test"))
diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/py/test/Ice/slicing/objects/ServerAMD.py
index 72a98f3f9af..ab4067c625c 100644
--- a/py/test/Ice/slicing/objects/ServerAMD.py
+++ b/py/test/Ice/slicing/objects/ServerAMD.py
@@ -304,7 +304,7 @@ class TestI(Test.TestIntf):
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+    properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
     object = TestI(adapter)
     adapter.add(object, Ice.stringToIdentity("Test"))