summaryrefslogtreecommitdiff
path: root/cs/test
diff options
context:
space:
mode:
Diffstat (limited to 'cs/test')
-rw-r--r--cs/test/Glacier2/attack/Server.cs2
-rwxr-xr-xcs/test/Glacier2/attack/run.py4
-rw-r--r--cs/test/Glacier2/router/Server.cs2
-rwxr-xr-xcs/test/Glacier2/router/run.py6
-rwxr-xr-xcs/test/Ice/adapterDeactivation/Collocated.cs2
-rwxr-xr-xcs/test/Ice/adapterDeactivation/Server.cs2
-rw-r--r--cs/test/Ice/binding/RemoteCommunicatorI.cs2
-rwxr-xr-xcs/test/Ice/binding/Server.cs2
-rwxr-xr-xcs/test/Ice/checksum/server/Server.cs2
-rwxr-xr-xcs/test/Ice/exceptions/AllTests.cs8
-rwxr-xr-xcs/test/Ice/exceptions/Collocated.cs2
-rwxr-xr-xcs/test/Ice/exceptions/Server.cs2
-rwxr-xr-xcs/test/Ice/facets/AllTests.cs2
-rwxr-xr-xcs/test/Ice/facets/Collocated.cs2
-rwxr-xr-xcs/test/Ice/facets/Server.cs2
-rwxr-xr-xcs/test/Ice/faultTolerance/Server.cs2
-rw-r--r--cs/test/Ice/hold/Server.cs2
-rwxr-xr-xcs/test/Ice/inheritance/Collocated.cs2
-rwxr-xr-xcs/test/Ice/inheritance/Server.cs2
-rwxr-xr-xcs/test/Ice/location/Server.cs2
-rwxr-xr-xcs/test/Ice/location/ServerManagerI.cs10
-rwxr-xr-xcs/test/Ice/objects/Collocated.cs2
-rwxr-xr-xcs/test/Ice/objects/Server.cs2
-rwxr-xr-xcs/test/Ice/operations/Collocated.cs2
-rwxr-xr-xcs/test/Ice/operations/Server.cs2
-rw-r--r--cs/test/Ice/retry/Server.cs2
-rwxr-xr-xcs/test/Ice/slicing/exceptions/Server.cs2
-rwxr-xr-xcs/test/Ice/slicing/objects/Server.cs2
-rw-r--r--cs/test/Ice/timeout/Server.cs2
-rwxr-xr-xcs/test/IceGrid/simple/run.py3
30 files changed, 41 insertions, 40 deletions
diff --git a/cs/test/Glacier2/attack/Server.cs b/cs/test/Glacier2/attack/Server.cs
index 40bd0be82b0..256bb44ce99 100644
--- a/cs/test/Glacier2/attack/Server.cs
+++ b/cs/test/Glacier2/attack/Server.cs
@@ -37,7 +37,7 @@ class Server : Ice.Application
{
public override 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/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py
index fbadcee93e0..48fb18554b8 100755
--- a/cs/test/Glacier2/attack/run.py
+++ b/cs/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/cs/test/Glacier2/router/Server.cs b/cs/test/Glacier2/router/Server.cs
index 0a3cb67036a..ab1cbbba6ae 100644
--- a/cs/test/Glacier2/router/Server.cs
+++ b/cs/test/Glacier2/router/Server.cs
@@ -13,7 +13,7 @@ public class Server : Ice.Application
{
public override 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/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py
index d830b6b0514..0939f538011 100755
--- a/cs/test/Glacier2/router/run.py
+++ b/cs/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/cs/test/Ice/adapterDeactivation/Collocated.cs b/cs/test/Ice/adapterDeactivation/Collocated.cs
index 07e119ecabe..d5802776d45 100755
--- a/cs/test/Ice/adapterDeactivation/Collocated.cs
+++ b/cs/test/Ice/adapterDeactivation/Collocated.cs
@@ -15,7 +15,7 @@ public class Collocated
{
public override 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/cs/test/Ice/adapterDeactivation/Server.cs b/cs/test/Ice/adapterDeactivation/Server.cs
index 2f5cc80f864..9cfc66909dd 100755
--- a/cs/test/Ice/adapterDeactivation/Server.cs
+++ b/cs/test/Ice/adapterDeactivation/Server.cs
@@ -13,7 +13,7 @@ public class Server
{
public override int run(string[] args)
{
- communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
+ communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
Ice.ServantLocator locator = new ServantLocatorI();
adapter.addServantLocator(locator, "");
diff --git a/cs/test/Ice/binding/RemoteCommunicatorI.cs b/cs/test/Ice/binding/RemoteCommunicatorI.cs
index eafc1aa4043..c22235c3707 100644
--- a/cs/test/Ice/binding/RemoteCommunicatorI.cs
+++ b/cs/test/Ice/binding/RemoteCommunicatorI.cs
@@ -15,7 +15,7 @@ public class RemoteCommunicatorI : 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/cs/test/Ice/binding/Server.cs b/cs/test/Ice/binding/Server.cs
index 9c6a5f6b282..2fd4fede356 100755
--- a/cs/test/Ice/binding/Server.cs
+++ b/cs/test/Ice/binding/Server.cs
@@ -11,7 +11,7 @@ public class Server
{
private static int run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Identity id = communicator.stringToIdentity("communicator");
adapter.add(new RemoteCommunicatorI(), id);
diff --git a/cs/test/Ice/checksum/server/Server.cs b/cs/test/Ice/checksum/server/Server.cs
index 80de1224a55..e9919705a16 100755
--- a/cs/test/Ice/checksum/server/Server.cs
+++ b/cs/test/Ice/checksum/server/Server.cs
@@ -13,7 +13,7 @@ public class Server
{
private static int run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object @object = new Test.ChecksumI(adapter);
adapter.add(@object, communicator.stringToIdentity("test"));
diff --git a/cs/test/Ice/exceptions/AllTests.cs b/cs/test/Ice/exceptions/AllTests.cs
index 1301d38f7f4..c3dec48c091 100755
--- a/cs/test/Ice/exceptions/AllTests.cs
+++ b/cs/test/Ice/exceptions/AllTests.cs
@@ -676,7 +676,7 @@ public class AllTests
// Expected
}
- communicator.getProperties().setProperty("TestAdapter0.Endpoints", "default");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter0.Endpoints", "default");
first = communicator.createObjectAdapter("TestAdapter0");
try
{
@@ -703,14 +703,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();
Console.WriteLine("ok");
}
{
Console.Write("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"));
@@ -738,7 +738,7 @@ public class AllTests
{
Console.Write("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/cs/test/Ice/exceptions/Collocated.cs b/cs/test/Ice/exceptions/Collocated.cs
index d2141318b3d..15a983dc1b6 100755
--- a/cs/test/Ice/exceptions/Collocated.cs
+++ b/cs/test/Ice/exceptions/Collocated.cs
@@ -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 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object obj = new ThrowerI(adapter);
adapter.add(obj, communicator.stringToIdentity("thrower"));
diff --git a/cs/test/Ice/exceptions/Server.cs b/cs/test/Ice/exceptions/Server.cs
index fd4e8916410..0a696111a7d 100755
--- a/cs/test/Ice/exceptions/Server.cs
+++ b/cs/test/Ice/exceptions/Server.cs
@@ -33,7 +33,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 2000:udp");
+ properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object @object = new ThrowerI(adapter);
adapter.add(@object, communicator.stringToIdentity("thrower"));
diff --git a/cs/test/Ice/facets/AllTests.cs b/cs/test/Ice/facets/AllTests.cs
index b0ff31b165c..6e8027acda6 100755
--- a/cs/test/Ice/facets/AllTests.cs
+++ b/cs/test/Ice/facets/AllTests.cs
@@ -23,7 +23,7 @@ public class AllTests
public static GPrx allTests(Ice.Communicator communicator)
{
Console.Write("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/cs/test/Ice/facets/Collocated.cs b/cs/test/Ice/facets/Collocated.cs
index 29a24de16da..aa84bb58d08 100755
--- a/cs/test/Ice/facets/Collocated.cs
+++ b/cs/test/Ice/facets/Collocated.cs
@@ -11,7 +11,7 @@ public class Collocated
{
private static int run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object d = new DI();
adapter.add(d, communicator.stringToIdentity("d"));
diff --git a/cs/test/Ice/facets/Server.cs b/cs/test/Ice/facets/Server.cs
index f18dcfcafa1..1be531133a7 100755
--- a/cs/test/Ice/facets/Server.cs
+++ b/cs/test/Ice/facets/Server.cs
@@ -11,7 +11,7 @@ public class Server
{
private static int run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object d = new DI();
adapter.add(d, communicator.stringToIdentity("d"));
diff --git a/cs/test/Ice/faultTolerance/Server.cs b/cs/test/Ice/faultTolerance/Server.cs
index 51a2f633fe7..4d0e30e8c5e 100755
--- a/cs/test/Ice/faultTolerance/Server.cs
+++ b/cs/test/Ice/faultTolerance/Server.cs
@@ -52,7 +52,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 obj = new TestI(adapter);
adapter.add(obj, communicator.stringToIdentity("test"));
diff --git a/cs/test/Ice/hold/Server.cs b/cs/test/Ice/hold/Server.cs
index 02f7034555b..00e960a38f0 100644
--- a/cs/test/Ice/hold/Server.cs
+++ b/cs/test/Ice/hold/Server.cs
@@ -11,7 +11,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/cs/test/Ice/inheritance/Collocated.cs b/cs/test/Ice/inheritance/Collocated.cs
index ed01a2cc2b7..13533733f88 100755
--- a/cs/test/Ice/inheritance/Collocated.cs
+++ b/cs/test/Ice/inheritance/Collocated.cs
@@ -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 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object obj = new InitialI(adapter);
adapter.add(obj, communicator.stringToIdentity("initial"));
diff --git a/cs/test/Ice/inheritance/Server.cs b/cs/test/Ice/inheritance/Server.cs
index 72f0c2f56f5..4928176493d 100755
--- a/cs/test/Ice/inheritance/Server.cs
+++ b/cs/test/Ice/inheritance/Server.cs
@@ -11,7 +11,7 @@ public class Server
{
private static int run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object @object = new InitialI(adapter);
adapter.add(@object, communicator.stringToIdentity("initial"));
diff --git a/cs/test/Ice/location/Server.cs b/cs/test/Ice/location/Server.cs
index bc19ac0b5fb..6a12a8de3be 100755
--- a/cs/test/Ice/location/Server.cs
+++ b/cs/test/Ice/location/Server.cs
@@ -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/cs/test/Ice/location/ServerManagerI.cs b/cs/test/Ice/location/ServerManagerI.cs
index 5e5e9ab636d..241add27aa0 100755
--- a/cs/test/Ice/location/ServerManagerI.cs
+++ b/cs/test/Ice/location/ServerManagerI.cs
@@ -19,11 +19,11 @@ public class ServerManagerI : ServerManagerDisp_
_registry = registry;
_communicators = new 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 override void startServer(Ice.Current current)
diff --git a/cs/test/Ice/objects/Collocated.cs b/cs/test/Ice/objects/Collocated.cs
index 060b17a0152..efaba31354f 100755
--- a/cs/test/Ice/objects/Collocated.cs
+++ b/cs/test/Ice/objects/Collocated.cs
@@ -14,7 +14,7 @@ public class Client
private static int
run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Initial initial = new InitialI(adapter);
adapter.add(initial, communicator.stringToIdentity("initial"));
diff --git a/cs/test/Ice/objects/Server.cs b/cs/test/Ice/objects/Server.cs
index 157b5578d7a..81788bb95dd 100755
--- a/cs/test/Ice/objects/Server.cs
+++ b/cs/test/Ice/objects/Server.cs
@@ -11,7 +11,7 @@ public class Server
{
private static int run(string[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object @object = new InitialI(adapter);
adapter.add(@object, communicator.stringToIdentity("initial"));
diff --git a/cs/test/Ice/operations/Collocated.cs b/cs/test/Ice/operations/Collocated.cs
index 338f68eb64b..ad893001941 100755
--- a/cs/test/Ice/operations/Collocated.cs
+++ b/cs/test/Ice/operations/Collocated.cs
@@ -13,7 +13,7 @@ public class Collocated
{
private static int run(String[] args, Ice.Communicator communicator)
{
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Identity id = communicator.stringToIdentity("test");
adapter.add(new MyDerivedClassI(adapter, id), id);
diff --git a/cs/test/Ice/operations/Server.cs b/cs/test/Ice/operations/Server.cs
index d9f817f7fa8..125bcc6a845 100755
--- a/cs/test/Ice/operations/Server.cs
+++ b/cs/test/Ice/operations/Server.cs
@@ -18,7 +18,7 @@ public class Server
//
communicator.getProperties().setProperty("Ice.Warn.Connections", "0");
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Identity id = communicator.stringToIdentity("test");
adapter.add(new MyDerivedClassI(adapter, id), id);
diff --git a/cs/test/Ice/retry/Server.cs b/cs/test/Ice/retry/Server.cs
index 26b55404e4a..b95c1f64b03 100644
--- a/cs/test/Ice/retry/Server.cs
+++ b/cs/test/Ice/retry/Server.cs
@@ -13,7 +13,7 @@ public class Server
{
public 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");
adapter.add(new RetryI(), communicator.stringToIdentity("retry"));
adapter.activate();
diff --git a/cs/test/Ice/slicing/exceptions/Server.cs b/cs/test/Ice/slicing/exceptions/Server.cs
index 62c4aa7568c..428ab61fbe7 100755
--- a/cs/test/Ice/slicing/exceptions/Server.cs
+++ b/cs/test/Ice/slicing/exceptions/Server.cs
@@ -13,7 +13,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/cs/test/Ice/slicing/objects/Server.cs b/cs/test/Ice/slicing/objects/Server.cs
index a6f678f73cf..76e901258a8 100755
--- a/cs/test/Ice/slicing/objects/Server.cs
+++ b/cs/test/Ice/slicing/objects/Server.cs
@@ -13,7 +13,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 obj = new TestI(adapter);
adapter.add(obj, communicator.stringToIdentity("Test"));
diff --git a/cs/test/Ice/timeout/Server.cs b/cs/test/Ice/timeout/Server.cs
index 77f934cfcb3..28a88ec7092 100644
--- a/cs/test/Ice/timeout/Server.cs
+++ b/cs/test/Ice/timeout/Server.cs
@@ -13,7 +13,7 @@ public class Server
{
public 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");
adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout"));
adapter.activate();
diff --git a/cs/test/IceGrid/simple/run.py b/cs/test/IceGrid/simple/run.py
index e47e4137ea8..4e190bf017c 100755
--- a/cs/test/IceGrid/simple/run.py
+++ b/cs/test/IceGrid/simple/run.py
@@ -31,7 +31,8 @@ testdir = os.path.join(toplevel, "test", name)
#
# 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.