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

44 files changed, 57 insertions, 51 deletions

diff --git a/py/CHANGES b/py/CHANGES
index 2f3854a20d9..3e8220a30c1 100644
--- a/py/CHANGES
+++ b/py/CHANGES
@@ -3,6 +3,12 @@ NOTE: Please keep changes in the appropriate section for HEAD or 3.1.
 Changes since version 3.1.1
 ---------------------------
 
+- Object adapter properties are now prefixed by "Ice.OA.". For example,
+  "Ice.OA.<Adpater name>.Endpoints" instead of "<Adpater name>.Endpoints".
+  The new properties can be set from the command line. The old style 
+  property names have been deprecated and support will be removed in a
+  future release.
+
 - Added Communicator::propertyToProxy() which creates a proxy from
   a set of properties. This function allows you to set various local
   proxy settings, such as the Locator cache timeout, which cannot be
diff --git a/py/demo/Glacier2/callback/config.client b/py/demo/Glacier2/callback/config.client
index b5b1b6d19a0..80783ab4894 100644
--- a/py/demo/Glacier2/callback/config.client
+++ b/py/demo/Glacier2/callback/config.client
@@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
 # object adapter named Callback.Client. This router proxy must
 # match the value of Glacier2.Client.Endpoints.
 #
-Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
+Ice.OA.Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
 
 #
 # We don't need any endpoints for the client if we use a
 # router. Incoming requests are received through connections
 # established from the client to the router.
 #
-Callback.Client.Endpoints=
+Ice.OA.Callback.Client.Endpoints=
 
 #
 # This must match the value of Callback.Server.Endpoints in
diff --git a/py/demo/Glacier2/callback/config.glacier2 b/py/demo/Glacier2/callback/config.glacier2
index cde23b9a94e..f4e6b214d14 100644
--- a/py/demo/Glacier2/callback/config.glacier2
+++ b/py/demo/Glacier2/callback/config.glacier2
@@ -18,7 +18,7 @@ Ice.ThreadPerConnection.StackSize=262144
 # The client-visible endpoint of Glacier2. This should be an endpoint
 # visible from the public Internet, and it should be secure.
 # 
-Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
+Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
 
 #
 # The server-visible endpoint of Glacier2. This endpoint is only
@@ -27,7 +27,7 @@ Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
 # on the loopback, so that the server is not directly accessible from
 # the Internet.
 #
-Glacier2.Server.Endpoints=tcp -h 127.0.0.1
+Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1
 
 # 
 # The configures the session manager. If no external session manager
diff --git a/py/demo/Glacier2/callback/config.server b/py/demo/Glacier2/callback/config.server
index 78e95043136..033b969d997 100644
--- a/py/demo/Glacier2/callback/config.server
+++ b/py/demo/Glacier2/callback/config.server
@@ -4,7 +4,7 @@
 # loopback, so that the server is not directly accessible from the
 # Internet.
 #
-Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Glacier2/callback/config.sessionserver b/py/demo/Glacier2/callback/config.sessionserver
index 864d6bd5720..3662d7fcea7 100644
--- a/py/demo/Glacier2/callback/config.sessionserver
+++ b/py/demo/Glacier2/callback/config.sessionserver
@@ -4,7 +4,7 @@
 # loopback, so that the session server is not directly accessible from
 # the Internet.
 #
-SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
+Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/async/config.server b/py/demo/Ice/async/config.server
index fd72066f5a5..c7d7b368b1b 100644
--- a/py/demo/Ice/async/config.server
+++ b/py/demo/Ice/async/config.server
@@ -3,7 +3,7 @@
 # "Queue". The following line sets the endpoints for this
 # adapter.
 #
-Queue.Endpoints=tcp -p 10000
+Ice.OA.Queue.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server
index c36f2405d66..e81cb4a8e39 100644
--- a/py/demo/Ice/bidir/config.server
+++ b/py/demo/Ice/bidir/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client
index a4b00fb2984..95caf8d3eae 100644
--- a/py/demo/Ice/callback/config.client
+++ b/py/demo/Ice/callback/config.client
@@ -1,5 +1,5 @@
 Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
-Callback.Client.Endpoints=tcp:udp:ssl
+Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server
index deaef3f87de..795a07e8f27 100644
--- a/py/demo/Ice/callback/config.server
+++ b/py/demo/Ice/callback/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server
index bb2040f2cdc..aeff24452ac 100644
--- a/py/demo/Ice/hello/config.server
+++ b/py/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
 # "Hello". The following line sets the endpoints for this
 # adapter.
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server
index f79409c7738..449847f90e6 100644
--- a/py/demo/Ice/latency/config.server
+++ b/py/demo/Ice/latency/config.server
@@ -1,4 +1,4 @@
-Latency.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1
 
 #Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../certs
diff --git a/py/demo/Ice/session/config.server b/py/demo/Ice/session/config.server
index 8aa8dfac36f..2731a988e56 100644
--- a/py/demo/Ice/session/config.server
+++ b/py/demo/Ice/session/config.server
@@ -3,7 +3,7 @@
 # "SessionFactory". The following line sets the endpoints for this
 # adapter.
 #
-SessionFactory.Endpoints=default -p 10000
+Ice.OA.SessionFactory.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server
index ddae4a1a27a..3b9fd7e7c6f 100644
--- a/py/demo/Ice/throughput/config.server
+++ b/py/demo/Ice/throughput/config.server
@@ -1,4 +1,4 @@
-Throughput.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1
 
 #Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../certs
diff --git a/py/demo/Ice/value/config.server b/py/demo/Ice/value/config.server
index 8f2cf355ffc..52e81b9e331 100644
--- a/py/demo/Ice/value/config.server
+++ b/py/demo/Ice/value/config.server
@@ -1 +1 @@
-Value.Endpoints=default -p 10000
+Ice.OA.Value.Endpoints=default -p 10000
diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox
index 07fb2e3cb6c..cd05e35ff37 100644
--- a/py/demo/IceStorm/clock/config.icebox
+++ b/py/demo/IceStorm/clock/config.icebox
@@ -1,7 +1,7 @@
 #
 # The IceBox server endpoint configuration
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998
 
 #
 # The IceStorm service
diff --git a/py/demo/IceStorm/clock/config.service b/py/demo/IceStorm/clock/config.service
index 539369861b0..4f1edc9ad3f 100644
--- a/py/demo/IceStorm/clock/config.service
+++ b/py/demo/IceStorm/clock/config.service
@@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
+Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # The IceStorm service instance name.
@@ -20,7 +20,7 @@ IceStorm.InstanceName=DemoIceStorm
 # IceStorm instances this must run on a fixed port (or use
 # IceGrid).
 #
-IceStorm.Publish.Endpoints=default -p 10001
+Ice.OA.IceStorm.Publish.Endpoints=default -p 10001
 
 #
 # TopicManager Tracing
diff --git a/py/demo/IceStorm/clock/config.sub b/py/demo/IceStorm/clock/config.sub
index d383e34e641..cb6b50d94f0 100644
--- a/py/demo/IceStorm/clock/config.sub
+++ b/py/demo/IceStorm/clock/config.sub
@@ -2,7 +2,7 @@
 # This property is used to configure the endpoints of the clock
 # subscriber adapter.
 #
-Clock.Subscriber.Endpoints=tcp
+Ice.OA.Clock.Subscriber.Endpoints=tcp
 
 #
 # This property is used by the clients to connect to IceStorm.
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"))