summaryrefslogtreecommitdiff
path: root/java/test/Ice/exceptions
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-12-18 17:06:44 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-12-18 17:06:44 +0000
commitd07fdae285690f699a70f97f36232e516dcad2bc (patch)
treec239def689c5e6cc53ac76dbe3e60ec11c306964 /java/test/Ice/exceptions
parentFixed tryLock() comment (diff)
downloadice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2
ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz
ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip
Object adapter properties now prefixed by "Ice.OA."
Diffstat (limited to 'java/test/Ice/exceptions')
-rw-r--r--java/test/Ice/exceptions/AllTests.java8
-rw-r--r--java/test/Ice/exceptions/Collocated.java2
-rw-r--r--java/test/Ice/exceptions/Server.java2
3 files changed, 6 insertions, 6 deletions
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"));