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

78 files changed, 258 insertions, 144 deletions

diff --git a/java/CHANGES b/java/CHANGES
index ba6abda0f6d..3174121a5c1 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,12 @@
 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.
+
 - The communcator object adapter now throw an InitializationException
   if the adapter has no configuration. It is possible to explicitly
   create a adapter with no configuration, useful for use with
diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py
index 13b17fabb85..2bce88b5f8f 100644
--- a/java/config/IceGridAdmin.py
+++ b/java/config/IceGridAdmin.py
@@ -30,7 +30,7 @@ ice_home = os.environ['ICE_HOME']
 iceGridPort = "12010";
 
 nodeOptions = r' --Ice.Warn.Connections=0' + \
-              r' --IceGrid.Node.Endpoints=default' + \
+              r' --Ice.OA.IceGrid.Node.Endpoints=default' + \
               r' --IceGrid.Node.WaitTime=30' + \
               r' --Ice.ProgramName=icegridnode' + \
               r' --IceGrid.Node.Trace.Replica=0' + \
@@ -44,9 +44,9 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \
 registryOptions = r' --Ice.Warn.Connections=0' + \
                   r' --IceGrid.Registry.PermissionsVerifier=IceGrid/NullPermissionsVerifier' + \
                   r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \
-                  r' --IceGrid.Registry.Server.Endpoints=default' + \
-                  r' --IceGrid.Registry.Internal.Endpoints=default' + \
-                  r' --IceGrid.Registry.SessionManager.Endpoints=default' + \
+                  r' --Ice.OA.IceGrid.Registry.Server.Endpoints=default' + \
+                  r' --Ice.OA.IceGrid.Registry.Internal.Endpoints=default' + \
+                  r' --Ice.OA.IceGrid.Registry.SessionManager.Endpoints=default' + \
                   r' --IceGrid.Registry.Trace.Session=0' + \
                   r' --IceGrid.Registry.Trace.Application=0' + \
                   r' --IceGrid.Registry.Trace.Adapter=0' + \
@@ -69,7 +69,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False):
 
     print "starting icegrid registry...",
     command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + registryOptions + \
-              r' --IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \
+              r' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \
               r' --IceGrid.Registry.Data=' + dataDir + \
               r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(ice_home, "config", "templates.xml")
 
diff --git a/java/demo/Freeze/library/config.collocated b/java/demo/Freeze/library/config.collocated
index ddcc878f677..3d0c4326d7f 100644
--- a/java/demo/Freeze/library/config.collocated
+++ b/java/demo/Freeze/library/config.collocated
@@ -1,5 +1,5 @@
 Library.Proxy=library:default -p 10000
-Library.Endpoints=default -p 10000
+Ice.OA.Library.Endpoints=default -p 10000
 Library.EvictorSize=3
 
 Freeze.Trace.Map=1
diff --git a/java/demo/Freeze/library/config.server b/java/demo/Freeze/library/config.server
index 2a0e997bbf6..ec6edf4a0e0 100644
--- a/java/demo/Freeze/library/config.server
+++ b/java/demo/Freeze/library/config.server
@@ -1,4 +1,4 @@
-Library.Endpoints=default -p 10000
+Ice.OA.Library.Endpoints=default -p 10000
 Library.EvictorSize=3
 
 Freeze.Trace.Map=1
diff --git a/java/demo/Freeze/phonebook/config.collocated b/java/demo/Freeze/phonebook/config.collocated
index 311adc0d6dd..31ceed6c126 100644
--- a/java/demo/Freeze/phonebook/config.collocated
+++ b/java/demo/Freeze/phonebook/config.collocated
@@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=1
 Freeze.Evictor.db.contacts.SavePeriod=10000
 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
 
-PhoneBook.Endpoints=default -p 10000
+Ice.OA.PhoneBook.Endpoints=default -p 10000
 PhoneBook.Proxy=phonebook:default -p 10000
 PhoneBook.EvictorSize=3
 
diff --git a/java/demo/Freeze/phonebook/config.server b/java/demo/Freeze/phonebook/config.server
index 861014c3a8b..db1c084ad28 100644
--- a/java/demo/Freeze/phonebook/config.server
+++ b/java/demo/Freeze/phonebook/config.server
@@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=1
 Freeze.Evictor.db.contacts.SavePeriod=10000
 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
 
-PhoneBook.Endpoints=default -p 10000
+Ice.OA.PhoneBook.Endpoints=default -p 10000
 PhoneBook.EvictorSize=3
 
 #
diff --git a/java/demo/Glacier2/callback/config.client b/java/demo/Glacier2/callback/config.client
index 0e261c0c2db..55a3e950354 100644
--- a/java/demo/Glacier2/callback/config.client
+++ b/java/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/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2
index be7d46ea2d4..64060c57b05 100644
--- a/java/demo/Glacier2/callback/config.glacier2
+++ b/java/demo/Glacier2/callback/config.glacier2
@@ -15,7 +15,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
@@ -24,7 +24,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/java/demo/Glacier2/callback/config.server b/java/demo/Glacier2/callback/config.server
index 78e95043136..033b969d997 100644
--- a/java/demo/Glacier2/callback/config.server
+++ b/java/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/java/demo/Glacier2/callback/config.sessionserver b/java/demo/Glacier2/callback/config.sessionserver
index 864d6bd5720..3662d7fcea7 100644
--- a/java/demo/Glacier2/callback/config.sessionserver
+++ b/java/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/java/demo/Ice/async/config.server b/java/demo/Ice/async/config.server
index fd72066f5a5..c7d7b368b1b 100644
--- a/java/demo/Ice/async/config.server
+++ b/java/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/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server
index 1e6ffd5e484..fa3219299a2 100755
--- a/java/demo/Ice/bidir/config.server
+++ b/java/demo/Ice/bidir/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000

+Ice.OA.Callback.Server.Endpoints=tcp -p 10000

 

 # Active connection management must be disabled when using

 # bidirectional connections.

diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client
index 289b0bc9e6f..a3289d5e0b7 100644
--- a/java/demo/Ice/callback/config.client
+++ b/java/demo/Ice/callback/config.client
@@ -1,5 +1,5 @@
 Callback.Client.CallbackServer=callback:tcp -p 12000: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/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
index 10d65a443ba..cf17b1509c2 100644
--- a/java/demo/Ice/callback/config.server
+++ b/java/demo/Ice/callback/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
+Ice.OA.Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/Ice/hello/config.server b/java/demo/Ice/hello/config.server
index 665fc131088..907e2a13a55 100644
--- a/java/demo/Ice/hello/config.server
+++ b/java/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
 # "helloadapater". 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/java/demo/Ice/invoke/config.server b/java/demo/Ice/invoke/config.server
index 0978234e8c4..e925636df8d 100644
--- a/java/demo/Ice/invoke/config.server
+++ b/java/demo/Ice/invoke/config.server
@@ -3,7 +3,7 @@
 # "helloadapater". The following line sets the endpoints for this
 # adapter
 #
-Printer.Endpoints=default -p 10000
+Ice.OA.Printer.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server
index 6d82f1a7f2e..33cbd33492e 100644
--- a/java/demo/Ice/latency/config.server
+++ b/java/demo/Ice/latency/config.server
@@ -1 +1 @@
-Latency.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1
diff --git a/java/demo/Ice/nested/config.client b/java/demo/Ice/nested/config.client
index a895324d0b5..cc7b8c0a0fb 100644
--- a/java/demo/Ice/nested/config.client
+++ b/java/demo/Ice/nested/config.client
@@ -1,5 +1,5 @@
 Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
-Nested.Client.Endpoints=default -t 10000
+Ice.OA.Nested.Client.Endpoints=default -t 10000
 
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server
index e0073284155..87c9057ed0d 100644
--- a/java/demo/Ice/nested/config.server
+++ b/java/demo/Ice/nested/config.server
@@ -1,4 +1,4 @@
-Nested.Server.Endpoints=default -p 10000 -t 10000
+Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000
 
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
diff --git a/java/demo/Ice/session/config.server b/java/demo/Ice/session/config.server
index 8aa8dfac36f..2731a988e56 100644
--- a/java/demo/Ice/session/config.server
+++ b/java/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/java/demo/Ice/throughput/config.client b/java/demo/Ice/throughput/config.client
index 3391b2ff0bb..df84838f465 100644
--- a/java/demo/Ice/throughput/config.client
+++ b/java/demo/Ice/throughput/config.client
@@ -1,5 +1,5 @@
 Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
-Throughput.Endpoints=default -p 10000
+Ice.OA.Throughput.Endpoints=default -p 10000
 
 Ice.ACM.Client=0
 Ice.ACM.Server=0
diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server
index 3391b2ff0bb..df84838f465 100644
--- a/java/demo/Ice/throughput/config.server
+++ b/java/demo/Ice/throughput/config.server
@@ -1,5 +1,5 @@
 Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
-Throughput.Endpoints=default -p 10000
+Ice.OA.Throughput.Endpoints=default -p 10000
 
 Ice.ACM.Client=0
 Ice.ACM.Server=0
diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server
index 4d7f600e5d7..3c7afee33aa 100644
--- a/java/demo/Ice/value/config.server
+++ b/java/demo/Ice/value/config.server
@@ -1,4 +1,4 @@
-Value.Endpoints=default -p 10000
+Ice.OA.Value.Endpoints=default -p 10000
 
 #
 # SSL Configuration
diff --git a/java/demo/IceBox/hello/config.icebox b/java/demo/IceBox/hello/config.icebox
index 07adfa38ce4..11f2b0741f7 100644
--- a/java/demo/IceBox/hello/config.icebox
+++ b/java/demo/IceBox/hello/config.icebox
@@ -3,7 +3,7 @@ IceBox.InstanceName=DemoIceBox
 #
 # The IceBox server endpoint configuration
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998
 
 #
 # The hello service
@@ -15,7 +15,7 @@ IceBox.Service.Hello=HelloServiceI
 # the service. The following line sets the endpoints for this
 # adapter.
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/IceGrid/allocate/config.grid b/java/demo/IceGrid/allocate/config.grid
index 3ca2082ddfb..1da5a23446c 100644
--- a/java/demo/IceGrid/allocate/config.grid
+++ b/java/demo/IceGrid/allocate/config.grid
@@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
+Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000
+Ice.OA.IceGrid.Registry.Server.Endpoints=default
+Ice.OA.IceGrid.Registry.Internal.Endpoints=default
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
+Ice.OA.IceGrid.Node.Endpoints=default
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/java/demo/IceGrid/sessionActivation/config.grid b/java/demo/IceGrid/sessionActivation/config.grid
index 3ca2082ddfb..1da5a23446c 100644
--- a/java/demo/IceGrid/sessionActivation/config.grid
+++ b/java/demo/IceGrid/sessionActivation/config.grid
@@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
+Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000
+Ice.OA.IceGrid.Registry.Server.Endpoints=default
+Ice.OA.IceGrid.Registry.Internal.Endpoints=default
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
+Ice.OA.IceGrid.Node.Endpoints=default
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/java/demo/IceGrid/simple/config.grid b/java/demo/IceGrid/simple/config.grid
index 3ca2082ddfb..1da5a23446c 100644
--- a/java/demo/IceGrid/simple/config.grid
+++ b/java/demo/IceGrid/simple/config.grid
@@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
+Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000
+Ice.OA.IceGrid.Registry.Server.Endpoints=default
+Ice.OA.IceGrid.Registry.Internal.Endpoints=default
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
+Ice.OA.IceGrid.Node.Endpoints=default
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox
index 07fb2e3cb6c..cd05e35ff37 100644
--- a/java/demo/IceStorm/clock/config.icebox
+++ b/java/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/java/demo/IceStorm/clock/config.service b/java/demo/IceStorm/clock/config.service
index 539369861b0..4f1edc9ad3f 100644
--- a/java/demo/IceStorm/clock/config.service
+++ b/java/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/java/demo/IceStorm/clock/config.sub b/java/demo/IceStorm/clock/config.sub
index d383e34e641..cb6b50d94f0 100644
--- a/java/demo/IceStorm/clock/config.sub
+++ b/java/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/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 04114b7557a..25d51cb72db 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -62,7 +62,7 @@ public final class CommunicatorI extends LocalObjectImpl implements Communicator
     public ObjectAdapter
     createObjectAdapter(String name)
     {
-	return createObjectAdapterWithEndpoints(name, getProperties().getProperty(name + ".Endpoints"));
+	return _instance.objectAdapterFactory().createObjectAdapter(name, "", null);
     }
 
     public ObjectAdapter
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 17ed667b8ab..c016a5533a0 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -69,7 +69,11 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	    if(!_noConfig)
 	    {
 	        final Properties properties = _instance.initializationData().properties;
-	        registerProcess = properties.getPropertyAsInt(_name +".RegisterProcess") > 0;
+		//
+		// DEPRECATED PROPERTY: Remove extra code in future release.
+		//
+	        registerProcess = properties.getPropertyAsIntWithDefault(_propertyPrefix + _name +".RegisterProcess",
+			properties.getPropertyAsInt(_name +".RegisterProcess")) > 0;
 	        printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0;
 	    }
 	}
@@ -708,12 +712,18 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	}
 
 	//
+	// DEPRECATED PROPERTIES: Remove extra code in future release.
+	//
+
+	//
 	// Make sure named adapter has some configuration.
 	//
+	final Properties properties = instance.initializationData().properties;
+	String[] oldProps = filterProperties(_name + ".");
 	if(endpointInfo.length() == 0 && router == null)
 	{
-	    java.util.Map oaProps = instance.initializationData().properties.getPropertiesForPrefix(_name + ".");
-	    if(oaProps.size() == 0)
+	    String[] props = filterProperties(_propertyPrefix + _name + ".");
+	    if(props.length == 0 && oldProps.length == 0)
 	    {
 	        InitializationException ex = new InitializationException();
 		ex.reason = "Object adapter \"" + _name + "\" requires configuration.";
@@ -721,14 +731,32 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	    }
 	}
 
-	_id = instance.initializationData().properties.getProperty(name + ".AdapterId");
-	_replicaGroupId = instance.initializationData().properties.getProperty(name + ".ReplicaGroupId");
+	if(oldProps.length != 0)
+	{
+	    String message = "The following properties have been deprecated, please prepend \"Ice.OA.\":";
+	    for(int i = 0; i < oldProps.length; ++i)
+	    {
+	        message += "\n    " + oldProps[i];
+	    }
+	    _instance.initializationData().logger.warning(message);
+	}
+
+	_id = properties.getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId",
+		properties.getProperty(_name + ".AdapterId"));
+	_replicaGroupId = properties.getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId",
+		properties.getProperty(_name + ".ReplicaGroupId"));
 	
         try
         {
 	    if(router == null)
 	    {
-	        router = RouterPrxHelper.uncheckedCast(_instance.proxyFactory().propertyToProxy(name + ".Router"));
+	        router = RouterPrxHelper.uncheckedCast(
+		    _instance.proxyFactory().propertyToProxy(_propertyPrefix + name + ".Router"));
+		if(router == null)
+		{
+	            router = RouterPrxHelper.uncheckedCast(
+		        _instance.proxyFactory().propertyToProxy(name + ".Router"));
+		}
 	    }
 	    if(router != null)
 	    {
@@ -796,7 +824,16 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	        // The connection factory might change it, for example, to
 	        // fill in the real port number.
 	        //
-	        java.util.ArrayList endpoints = parseEndpoints(endpointInfo);
+	        java.util.ArrayList endpoints;
+		if(endpointInfo.length() == 0)
+		{
+		    endpoints = parseEndpoints(properties.getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints",
+		    	properties.getProperty(_name + ".Endpoints")));
+		}
+		else
+		{
+		    endpoints = parseEndpoints(endpointInfo);
+		}
 	        for(int i = 0; i < endpoints.size(); ++i)
 	        {
 		    IceInternal.EndpointI endp = (IceInternal.EndpointI)endpoints.get(i);
@@ -817,7 +854,8 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	        // Parse published endpoints. If set, these are used in proxies
 	        // instead of the connection factory Endpoints.
 	        //
-	        String endpts = _instance.initializationData().properties.getProperty(name + ".PublishedEndpoints");
+	        String endpts = properties.getPropertyWithDefault(_propertyPrefix + _name + ".PublishedEndpoints",
+			properties.getProperty(_name + ".PublishedEndpoints"));
 	        _publishedEndpoints = parseEndpoints(endpts);
 	        if(_publishedEndpoints.size() == 0)
 	        {
@@ -843,11 +881,16 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	        }
 	    }
 
-	    String locatorProperty = name + ".Locator";
-	    if(_instance.initializationData().properties.getProperty(locatorProperty).length() > 0)
+	    String locatorProperty = _propertyPrefix + _name + ".Locator";
+	    if(properties.getProperty(locatorProperty).length() > 0)
 	    {
 		setLocator(LocatorPrxHelper.uncheckedCast(_instance.proxyFactory().propertyToProxy(locatorProperty)));
 	    }
+	    else if(properties.getProperty(_name + ".Locator").length() > 0)
+	    {
+	        setLocator(LocatorPrxHelper.uncheckedCast(
+		    _instance.proxyFactory().propertyToProxy(_name + ".Locator")));
+	    }
 	    else
 	    {
 		setLocator(_instance.referenceFactory().getDefaultLocator());
@@ -855,11 +898,24 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 
 	    if(!_instance.threadPerConnection())
 	    {
-		int size = _instance.initializationData().properties.getPropertyAsInt(_name + ".ThreadPool.Size");
-		int sizeMax = _instance.initializationData().properties.getPropertyAsInt(_name + ".ThreadPool.SizeMax");
-		if(size > 0 || sizeMax > 0)
+	        if(properties.getProperty(_propertyPrefix + _name + ".ThreadPool.Size").length() != 0 ||
+		   properties.getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").length() != 0)
+ 		{
+		    int size = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size");
+		    int sizeMax = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax");
+		    if(size > 0 || sizeMax > 0)
+		    {
+		        _threadPool = new IceInternal.ThreadPool(_instance, _propertyPrefix + _name + ".ThreadPool", 0);
+		    }
+		}
+		else
 		{
-		    _threadPool = new IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0);
+		    int size = properties.getPropertyAsInt(_name + ".ThreadPool.Size");
+		    int sizeMax = properties.getPropertyAsInt(_name + ".ThreadPool.SizeMax");
+		    if(size > 0 || sizeMax > 0)
+		    {
+		        _threadPool = new IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0);
+		    }
 		}
 	    }
         }
@@ -1144,6 +1200,37 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	}
     }    
 
+    static private String[] _suffixes = 
+    {
+        "AdapterId",
+        "Endpoints",
+        "Locator",
+        "PublishedEndpoints",
+        "RegisterProcess",
+        "ReplicaGroupId",
+        "Router",
+        "ThreadPool.Size",
+        "ThreadPool.SizeMax",
+        "ThreadPool.SizeWarn",
+        "ThreadPool.StackSize"
+    };
+
+    String[]
+    filterProperties(String prefix)
+    {
+        java.util.ArrayList propertySet = new java.util.ArrayList();
+	java.util.Map props = _instance.initializationData().properties.getPropertiesForPrefix(prefix);
+	for(int i = 0; i < _suffixes.length; ++i)
+	{
+	    if(props.containsKey(prefix + _suffixes[i]))
+	    {
+	        propertySet.add(prefix + _suffixes[i]);
+	    }
+	}
+
+	return (String[])propertySet.toArray(new String[0]);
+    }
+
     private static class ProcessI extends _ProcessDisp
     {
         ProcessI(Communicator communicator)
@@ -1197,4 +1284,5 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
     private boolean _waitForActivate;
     private boolean _waitForDeactivate;
     private boolean _noConfig;
+    static private String _propertyPrefix = "Ice.OA.";
 }
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index 0bc82241717..04397bb6fdb 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -68,7 +68,12 @@ public final class Admin
 	    String managerProxy;
 	    if(properties.getProperty("Ice.Default.Locator").length() == 0)
 	    {
-		String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
+	        //
+		// DEPREACTED PROPERTIES: Remove extra code in future release.
+		//
+		String managerEndpoints = 
+		    properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints",
+						      properties.getProperty("IceBox.ServiceManager.Endpoints"));
 		if(managerEndpoints.length() == 0)
 		{
 		    System.err.println(appName() + ": property `IceBox.ServiceManager.Endpoints' is not set");
@@ -79,7 +84,12 @@ public final class Admin
 	    }
 	    else
 	    {
-		String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
+	        //
+		// DEPREACTED PROPERTIES: Remove extra code in future release.
+		//
+		String managerAdapterId = 
+		    properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId",
+		    				      properties.getProperty("IceBox.ServiceManager.AdapterId"));
 		if(managerAdapterId.length() == 0)
 		{
 		    System.err.println(appName() + ": property `IceBox.ServiceManager.AdapterId' is not set");
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java
index aa96cb4f8c1..fd854398a79 100755
--- a/java/src/IceGridGUI/Application/PlainServer.java
+++ b/java/src/IceGridGUI/Application/PlainServer.java
@@ -89,8 +89,8 @@ class PlainServer extends Communicator implements Server
     {
 	java.util.LinkedList properties = new java.util.LinkedList();
 	properties.add(new PropertyDescriptor("IceBox.InstanceName", "${server}"));
-	properties.add(new PropertyDescriptor("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
-	properties.add(new PropertyDescriptor("IceBox.RegisterProcess", "1"));
+	properties.add(new PropertyDescriptor("Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
+	properties.add(new PropertyDescriptor("Ice.OA.IceBox.RegisterProcess", "1"));
 
 	return new IceBoxDescriptor(
 	    new java.util.LinkedList(),
diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java
index 0de2e690502..f5e84bf10ff 100755
--- a/java/src/IceGridGUI/Application/PropertiesField.java
+++ b/java/src/IceGridGUI/Application/PropertiesField.java
@@ -94,8 +94,8 @@ public class PropertiesField extends JTable
 	    while(p.hasNext())
 	    {
 		AdapterDescriptor ad = (AdapterDescriptor)p.next();
-		hiddenPropertyNames.add(ad.name + ".Endpoints");
-		hiddenPropertyNames.add(ad.name + ".PublishedEndpoints");
+		hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints");
+		hiddenPropertyNames.add("Ice.OA." + ad.name + ".PublishedEndpoints");
 	    }
 	}
 
diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java
index b74fd1f2698..d974135f158 100755
--- a/java/src/IceGridGUI/Application/TreeNode.java
+++ b/java/src/IceGridGUI/Application/TreeNode.java
@@ -141,7 +141,7 @@ public abstract class TreeNode extends TreeNodeBase
 	    while(p.hasNext())
 	    {
 		AdapterDescriptor ad = (AdapterDescriptor)p.next();
-		hiddenPropertyNames.add(ad.name + ".Endpoints");
+		hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints");
 	    }
 	}
 
diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java
index aa44dfc081c..e69428ea9b3 100755
--- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java
@@ -71,9 +71,9 @@ class AdapterEditor extends Editor
 	java.util.Map properties = adapter.getProperties();
 	
 	// getId() returns the name of the adapter!
-	_endpoints.setText(resolver.substitute((String)properties.get(adapter.getId() + ".Endpoints")));
+	_endpoints.setText(resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".Endpoints")));
 	_publishedEndpoints.setText(
-	    resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints")));
+	    resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".PublishedEndpoints")));
 	
 	_registerProcess.setSelected(descriptor.registerProcess);	
 	_serverLifetime.setSelected(descriptor.serverLifetime);
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 5fa671f2164..fc4d6aa214a 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Dec 11 11:13:50 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Dec 18 13:40:21 2006
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -52,12 +52,23 @@ public final class PropertyNames
         "^Ice\\.MonitorConnections$",
         "^Ice\\.Nohup$",
         "^Ice\\.NullHandleAbort$",
+        "^Ice\\.OA\\.[^\\s]+\\.AdapterId$",
+        "^Ice\\.OA\\.[^\\s]+\\.Endpoints$",
+        "^Ice\\.OA\\.[^\\s]+\\.Locator$",
+        "^Ice\\.OA\\.[^\\s]+\\.PublishedEndpoints$",
+        "^Ice\\.OA\\.[^\\s]+\\.RegisterProcess$",
+        "^Ice\\.OA\\.[^\\s]+\\.ReplicaGroupId$",
+        "^Ice\\.OA\\.[^\\s]+\\.Router$",
+        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.Size$",
+        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.SizeMax$",
+        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.SizeWarn$",
+        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.StackSize$",
         "^Ice\\.Override\\.Compress$",
         "^Ice\\.Override\\.ConnectTimeout$",
         "^Ice\\.Override\\.Timeout$",
         "^Ice\\.Override\\.Secure$",
-        "^Ice\\.Package\\.[^\\s.]+$",
-        "^Ice\\.Plugin\\.[^\\s.]+$",
+        "^Ice\\.Package\\.[^\\s]+$",
+        "^Ice\\.Plugin\\.[^\\s]+$",
         "^Ice\\.PluginLoadOrder$",
         "^Ice\\.PrintAdapterReady$",
         "^Ice\\.PrintProcessId$",
@@ -101,7 +112,7 @@ public final class PropertyNames
         "^IceBox\\.InstanceName$",
         "^IceBox\\.LoadOrder$",
         "^IceBox\\.PrintServicesReady$",
-        "^IceBox\\.Service\\.[^\\s.]+$",
+        "^IceBox\\.Service\\.[^\\s]+$",
         "^IceBox\\.ServiceManager\\.AdapterId$",
         "^IceBox\\.ServiceManager\\.ReplicaGroupId$",
         "^IceBox\\.ServiceManager\\.Endpoints$",
@@ -111,7 +122,7 @@ public final class PropertyNames
         "^IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax$",
         "^IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn$",
         "^IceBox\\.ServiceManager\\.ThreadPool\\.StackSize$",
-        "^IceBox\\.UseSharedCommunicator\\.[^\\s.]+$",
+        "^IceBox\\.UseSharedCommunicator\\.[^\\s]+$",
         null
     };
 
@@ -253,10 +264,10 @@ public final class PropertyNames
         "^IceSSL\\.CheckCRL$",
         "^IceSSL\\.Ciphers$",
         "^IceSSL\\.DefaultDir$",
-        "^IceSSL\\.DH\\.[^\\s.]+$",
+        "^IceSSL\\.DH\\.[^\\s]+$",
         "^IceSSL\\.EntropyDaemon$",
-        "^IceSSL\\.FindCert\\.[^\\s.]+\\.[^\\s.]+$",
-        "^IceSSL\\.ImportCert\\.[^\\s.]+\\.[^\\s.]+$",
+        "^IceSSL\\.FindCert\\.[^\\s]+$",
+        "^IceSSL\\.ImportCert\\.[^\\s]+$",
         "^IceSSL\\.KeyFile$",
         "^IceSSL\\.Keystore$",
         "^IceSSL\\.KeystorePassword$",
@@ -274,7 +285,7 @@ public final class PropertyNames
         "^IceSSL\\.TrustOnly$",
         "^IceSSL\\.TrustOnly\\.Client$",
         "^IceSSL\\.TrustOnly\\.Server$",
-        "^IceSSL\\.TrustOnly\\.Server\\.[^\\s.]+$",
+        "^IceSSL\\.TrustOnly\\.Server\\.[^\\s]+$",
         null
     };
 
@@ -392,17 +403,17 @@ public final class PropertyNames
 
     public static final String FreezeProps[] =
     {
-        "^Freeze\\.DbEnv\\.[^\\s.]+\\.CheckpointPeriod$",
-        "^Freeze\\.DbEnv\\.[^\\s.]+\\.DbHome$",
-        "^Freeze\\.DbEnv\\.[^\\s.]+\\.DbPrivate$",
-        "^Freeze\\.DbEnv\\.[^\\s.]+\\.DbRecoverFatal$",
-        "^Freeze\\.DbEnv\\.[^\\s.]+\\.OldLogsAutoDelete$",
-        "^Freeze\\.DbEnv\\.[^\\s.]+\\.PeriodicCheckpointMinSize$",
-        "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.MaxTxSize$",
-        "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.SavePeriod$",
-        "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.SaveSizeTrigger$",
-        "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.StreamTimeout$",
-        "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.PopulateEmptyIndices$",
+        "^Freeze\\.DbEnv\\.[^\\s]+\\.CheckpointPeriod$",
+        "^Freeze\\.DbEnv\\.[^\\s]+\\.DbHome$",
+        "^Freeze\\.DbEnv\\.[^\\s]+\\.DbPrivate$",
+        "^Freeze\\.DbEnv\\.[^\\s]+\\.DbRecoverFatal$",
+        "^Freeze\\.DbEnv\\.[^\\s]+\\.OldLogsAutoDelete$",
+        "^Freeze\\.DbEnv\\.[^\\s]+\\.PeriodicCheckpointMinSize$",
+        "^Freeze\\.Evictor\\.[^\\s]+\\.MaxTxSize$",
+        "^Freeze\\.Evictor\\.[^\\s]+\\.SavePeriod$",
+        "^Freeze\\.Evictor\\.[^\\s]+\\.SaveSizeTrigger$",
+        "^Freeze\\.Evictor\\.[^\\s]+\\.StreamTimeout$",
+        "^Freeze\\.Evictor\\.[^\\s]+\\.PopulateEmptyIndices$",
         "^Freeze\\.Evictor\\.UseNonmutating$",
         "^Freeze\\.Trace\\.DbEnv$",
         "^Freeze\\.Trace\\.Evictor$",
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);