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

40 files changed, 53 insertions, 54 deletions

diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java
index b5037579877..d072de1ee16 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/Freeze/evictor/Server.java
@@ -46,8 +46,7 @@ public class Server
     static int
     run(String[] args, Ice.Communicator communicator, String envName)
     {
-        communicator.getProperties().setProperty("Evictor.Endpoints", "default -p 12010");
-
+        communicator.getProperties().setProperty("Ice.OA.Evictor.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("Evictor");
     
         RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, envName);
diff --git a/java/test/Freeze/oldevictor/Server.java b/java/test/Freeze/oldevictor/Server.java
index b5037579877..d072de1ee16 100644
--- a/java/test/Freeze/oldevictor/Server.java
+++ b/java/test/Freeze/oldevictor/Server.java
@@ -46,8 +46,7 @@ public class Server
     static int
     run(String[] args, Ice.Communicator communicator, String envName)
     {
-        communicator.getProperties().setProperty("Evictor.Endpoints", "default -p 12010");
-
+        communicator.getProperties().setProperty("Ice.OA.Evictor.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("Evictor");
     
         RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, envName);
diff --git a/java/test/Glacier2/attack/BackendServer.java b/java/test/Glacier2/attack/BackendServer.java
index 6109dbfaf7a..2603e5ba691 100644
--- a/java/test/Glacier2/attack/BackendServer.java
+++ b/java/test/Glacier2/attack/BackendServer.java
@@ -14,7 +14,7 @@ class BackendServer extends Ice.Application
     public int
     run(String[] args)
     {
-	communicator().getProperties().setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000");
+	communicator().getProperties().setProperty("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("BackendAdapter");
 	adapter.addServantLocator(new ServantLocatorI(), "");
         adapter.activate();
diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py
index 5349aaee88e..e9fe9db3dfb 100755
--- a/java/test/Glacier2/attack/run.py
+++ b/java/test/Glacier2/attack/run.py
@@ -31,8 +31,8 @@ router = os.path.join(ice_home, "bin", "glacier2router")
 command = router + TestUtil.cppClientServerOptions + \
 	  r' --Ice.PrintProcessId' \
           r' --Glacier2.RoutingTable.MaxSize=10' + \
-          r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-          r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+          r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
+          r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
           r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"'
 
 print "starting router...",
diff --git a/java/test/Glacier2/router/CallbackServer.java b/java/test/Glacier2/router/CallbackServer.java
index 79650ddc031..29c2fd01915 100644
--- a/java/test/Glacier2/router/CallbackServer.java
+++ b/java/test/Glacier2/router/CallbackServer.java
@@ -14,7 +14,7 @@ class CallbackServer extends Ice.Application
     public int
     run(String[] args)
     {
-	communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000");
+	communicator().getProperties().setProperty("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
 	adapter.add(new CallbackI(),
 		    communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category.
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index 4fa7ac4cbaf..33dd558c297 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -34,9 +34,9 @@ command = router + TestUtil.cppClientServerOptions + \
           r' --Glacier2.Filter.Category.Accept="c1 c2"' + \
           r' --Glacier2.Filter.Category.AcceptUser="2"' + \
           r' --Glacier2.SessionTimeout="30"' + \
-          r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-          r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
-          r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+          r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
+          r' --Ice.OA.Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
+          r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
           r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/router/passwords"'
 
 print "starting router...",
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java
index c3e650cd868..a9e07b0a996 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/Ice/adapterDeactivation/Collocated.java
@@ -14,7 +14,7 @@ public class Collocated
         public int
         run(String[] args)
         {
-            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+            communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
             Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
             Ice.ServantLocator locator = new ServantLocatorI();
             adapter.addServantLocator(locator, "");
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 3bfc71ac8be..dc61855d95f 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -14,7 +14,7 @@ public class Server
         public int
         run(String[] args)
         {
-            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
+            communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
             Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
             Ice.ServantLocator locator = new ServantLocatorI();
 
diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/Ice/binding/RemoteCommunicatorI.java
index 3e914af3cb0..44b562f28e2 100644
--- a/java/test/Ice/binding/RemoteCommunicatorI.java
+++ b/java/test/Ice/binding/RemoteCommunicatorI.java
@@ -15,7 +15,7 @@ public class RemoteCommunicatorI extends _RemoteCommunicatorDisp
     createObjectAdapter(String name, String endpoints, Ice.Current current)
     {
 	Ice.Communicator com = current.adapter.getCommunicator();
-	com.getProperties().setProperty(name + ".ThreadPool.Size", "1");
+	com.getProperties().setProperty("Ice.OA." + name + ".ThreadPool.Size", "1");
 	Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints);
 	return RemoteObjectAdapterPrxHelper.uncheckedCast(
 	    current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter)));
diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java
index 908c3c1d27e..335ead21769 100644
--- a/java/test/Ice/binding/Server.java
+++ b/java/test/Ice/binding/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010:udp");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Identity id = communicator.stringToIdentity("communicator");
         adapter.add(new RemoteCommunicatorI(), id);
diff --git a/java/test/Ice/checksum/server/Server.java b/java/test/Ice/checksum/server/Server.java
index e152d0680f2..e3ab5ba5169 100644
--- a/java/test/Ice/checksum/server/Server.java
+++ b/java/test/Ice/checksum/server/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ChecksumI(adapter);
         adapter.add(object, communicator.stringToIdentity("test"));
diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java
index 4a698d51fca..b52d59d9d34 100644
--- a/java/test/Ice/custom/Collocated.java
+++ b/java/test/Ice/custom/Collocated.java
@@ -12,7 +12,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object test = new TestI(communicator);
         adapter.add(test, communicator.stringToIdentity("test"));
diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java
index fe6082914bd..67a65e536c9 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/Ice/custom/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object test = new TestI(communicator);
         adapter.add(test, communicator.stringToIdentity("test"));
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index a9f75b9e34b..09cccf1006c 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -729,7 +729,7 @@ public class AllTests
 	        // Expected
 	    }
 
-	    communicator.getProperties().setProperty("TestAdapter0.Endpoints", "default");
+	    communicator.getProperties().setProperty("Ice.OA.TestAdapter0.Endpoints", "default");
 	    first = communicator.createObjectAdapter("TestAdapter0");
 	    try
 	    {
@@ -751,14 +751,14 @@ public class AllTests
 	    {
 		// Expected
 	    }
-	    test(communicator.getProperties().getProperty("TestAdapter0.Endpoints").equals("default"));
+	    test(communicator.getProperties().getProperty("Ice.OA.TestAdapter0.Endpoints").equals("default"));
 	    first.deactivate();
 	    System.out.println("ok");
 	}
 	
         {
 	    System.out.print("testing servant registration exceptions... ");
-	    communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default");
+	    communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default");
 	    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1");
 	    Ice.Object obj = new EmptyI();
 	    adapter.add(obj, communicator.stringToIdentity("x"));
@@ -786,7 +786,7 @@ public class AllTests
 
 	{
 	    System.out.print("testing servant locator registration exceptions... ");
-	    communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default");
+	    communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default");
 	    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter2");
 	    Ice.ServantLocator loc = new ServantLocatorI();
 	    adapter.addServantLocator(loc, "x");
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index e66910ef1a9..bdb45582272 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -12,7 +12,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
         adapter.add(object, communicator.stringToIdentity("thrower"));
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index 16aceacb26e..3658a024e81 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -15,7 +15,7 @@ public class Server
         Ice.Properties properties = communicator.getProperties();
 	// We don't need to disable warnings, because we have a dummy logger.
         //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");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
         adapter.add(object, communicator.stringToIdentity("thrower"));
diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java
index 145d755516c..cea5b7970b4 100644
--- a/java/test/Ice/exceptionsAMD/Server.java
+++ b/java/test/Ice/exceptionsAMD/Server.java
@@ -15,7 +15,7 @@ public class Server
         Ice.Properties properties = communicator.getProperties();
 	// We don't need to disable warnings, because we have a dummy logger.
         //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");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
         adapter.add(object, communicator.stringToIdentity("thrower"));
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 1a973d9a7b6..dd8ebab48be 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -24,7 +24,7 @@ public class AllTests
     allTests(Ice.Communicator communicator)
     {
         System.out.print("testing facet registration exceptions... ");
-	communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default");
+	communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default");
 	Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter");
 	Ice.Object obj = new EmptyI();
         adapter.add(obj, communicator.stringToIdentity("d"));
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 57dae86829f..8ad09d661bb 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -12,7 +12,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object d = new DI();
         adapter.add(d, communicator.stringToIdentity("d"));
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 1b96f6bd22a..ef76e630f25 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object d = new DI();
         adapter.add(d, communicator.stringToIdentity("d"));
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index 945a57d480f..20479bd75e7 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -54,7 +54,7 @@ public class Server
             return 1;
         }
 
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p " + port + ":udp");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new TestI(adapter, port);
         adapter.add(object, communicator.stringToIdentity("test"));
diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java
index cf67f2624a5..75b9a4fa56c 100644
--- a/java/test/Ice/hold/Server.java
+++ b/java/test/Ice/hold/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator 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");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         adapter.add(new HoldI(), communicator.stringToIdentity("hold"));
         adapter.activate();
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index 2c3bb3c32bf..46d72ad7255 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -12,7 +12,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, communicator.stringToIdentity("initial"));
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 72f64a3e2dc..c45f57e7d57 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, communicator.stringToIdentity("initial"));
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index 7695cc73d68..11ce8285cef 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -19,7 +19,7 @@ public class Server
 	//
 	Ice.Properties properties = communicator.getProperties();
 	properties.setProperty("Ice.ThreadPool.Server.Size", "2");
-	properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp");
+	properties.setProperty("Ice.OA.ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp");
 
 	Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter");
 
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java
index 459e297ae95..b3ebcb7181d 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/Ice/location/ServerManagerI.java
@@ -18,11 +18,11 @@ public class ServerManagerI extends _ServerManagerDisp
 	_communicators = new java.util.ArrayList();
 	_initData = initData;
 
-	_initData.properties.setProperty("TestAdapter.Endpoints", "default");
-	_initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
-	_initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
-	_initData.properties.setProperty("TestAdapter2.Endpoints", "default");
-	_initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+	_initData.properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default");
+	_initData.properties.setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter");
+	_initData.properties.setProperty("Ice.OA.TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+	_initData.properties.setProperty("Ice.OA.TestAdapter2.Endpoints", "default");
+	_initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2");
     }
 
     public void
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index 693a7314c42..df4ae229345 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -14,7 +14,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Initial initial = new InitialI(adapter);
         adapter.add(initial, communicator.stringToIdentity("initial"));
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 94d4c639c3b..392275fcd62 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, communicator.stringToIdentity("initial"));
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index bd792b1b193..922c5f7554e 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -12,7 +12,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Identity id = communicator.stringToIdentity("test");
         adapter.add(new MyDerivedClassI(adapter, id), id);
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index c4587b3a49e..e9f87e54f3d 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010:udp");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Identity id = communicator.stringToIdentity("test");
         adapter.add(new MyDerivedClassI(adapter, id), id);
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index dcfe6be3c3b..f1904824aff 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator 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");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Identity id = communicator.stringToIdentity("test");
         adapter.add(new MyDerivedClassI(adapter, id), id);
diff --git a/java/test/Ice/package/Server.java b/java/test/Ice/package/Server.java
index f654daa8c1a..8f58212a801 100644
--- a/java/test/Ice/package/Server.java
+++ b/java/test/Ice/package/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI();
         adapter.add(object, communicator.stringToIdentity("initial"));
diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java
index 07599c76676..a6d242aaa58 100644
--- a/java/test/Ice/retry/Server.java
+++ b/java/test/Ice/retry/Server.java
@@ -17,9 +17,9 @@ public class Server
 	// overridden by configuration. If it isn't then we assume
 	// defaults.
 	//
-	if(communicator.getProperties().getProperty("TestAdapter.Endpoints").length() == 0)
+	if(communicator.getProperties().getProperty("Ice.OA.TestAdapter.Endpoints").length() == 0)
 	{
-	    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
 	}
 
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
diff --git a/java/test/Ice/slicing/exceptions/ssrc/Server.java b/java/test/Ice/slicing/exceptions/ssrc/Server.java
index 838720c51da..82d0ca056e4 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/Server.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java
@@ -14,7 +14,7 @@ public class Server
     {
         Ice.Properties properties = communicator.getProperties();
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+        properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new TestI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("Test"));
diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java
index 26f31323549..76cb1f20cda 100644
--- a/java/test/Ice/slicing/exceptionsAMD/Server.java
+++ b/java/test/Ice/slicing/exceptionsAMD/Server.java
@@ -14,7 +14,7 @@ public class Server
     {
         Ice.Properties properties = communicator.getProperties();
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+        properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new TestI(adapter);
         adapter.add(object, communicator.stringToIdentity("Test"));
diff --git a/java/test/Ice/slicing/objects/ssrc/Server.java b/java/test/Ice/slicing/objects/ssrc/Server.java
index 838720c51da..82d0ca056e4 100644
--- a/java/test/Ice/slicing/objects/ssrc/Server.java
+++ b/java/test/Ice/slicing/objects/ssrc/Server.java
@@ -14,7 +14,7 @@ public class Server
     {
         Ice.Properties properties = communicator.getProperties();
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+        properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new TestI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("Test"));
diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java
index 26f31323549..76cb1f20cda 100644
--- a/java/test/Ice/slicing/objectsAMD/Server.java
+++ b/java/test/Ice/slicing/objectsAMD/Server.java
@@ -14,7 +14,7 @@ public class Server
     {
         Ice.Properties properties = communicator.getProperties();
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+        properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new TestI(adapter);
         adapter.add(object, communicator.stringToIdentity("Test"));
diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java
index a6ed62b6825..e578d97fa45 100644
--- a/java/test/Ice/timeout/Server.java
+++ b/java/test/Ice/timeout/Server.java
@@ -17,9 +17,9 @@ public class Server
 	// overridden by configuration. If it isn't then we assume
 	// defaults.
 	//
-	if(communicator.getProperties().getProperty("TestAdapter.Endpoints").length() == 0)
+	if(communicator.getProperties().getProperty("Ice.OA.TestAdapter.Endpoints").length() == 0)
 	{
-	    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	    communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000");
 	}
 
 	Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
diff --git a/java/test/IceGrid/simple/run.py b/java/test/IceGrid/simple/run.py
index 045588931e9..c3980d610be 100755
--- a/java/test/IceGrid/simple/run.py
+++ b/java/test/IceGrid/simple/run.py
@@ -32,7 +32,8 @@ os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.g
 #
 # 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/java/test/IceSSL/configuration/Server.java b/java/test/IceSSL/configuration/Server.java
index 72417152f35..503d3b3d858 100644
--- a/java/test/IceSSL/configuration/Server.java
+++ b/java/test/IceSSL/configuration/Server.java
@@ -12,7 +12,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-	communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -p 12010");
+	communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "tcp -p 12010");
 	Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
 	Ice.Identity id = communicator.stringToIdentity("factory");
 	adapter.add(new ServerFactoryI(), id);