summaryrefslogtreecommitdiff
path: root/py/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 /py/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 'py/test/Ice/exceptions')
-rw-r--r--py/test/Ice/exceptions/AllTests.py4
-rw-r--r--py/test/Ice/exceptions/Collocated.py2
-rw-r--r--py/test/Ice/exceptions/Server.py2
-rw-r--r--py/test/Ice/exceptions/ServerAMD.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py
index 438cbdb53f7..c7092d50dfa 100644
--- a/py/test/Ice/exceptions/AllTests.py
+++ b/py/test/Ice/exceptions/AllTests.py
@@ -289,7 +289,7 @@ class AMI_WrongOperation_noSuchOperationI(CallbackBase):
def allTests(communicator):
print "testing servant registration exceptions... ",
- communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default")
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default")
adapter = communicator.createObjectAdapter("TestAdapter1")
obj = EmptyI()
adapter.add(obj, communicator.stringToIdentity("x"))
@@ -310,7 +310,7 @@ def allTests(communicator):
print "ok"
print "testing servant locator registrations exceptions... ",
- communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default")
+ communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default")
adapter = communicator.createObjectAdapter("TestAdapter2")
loc = ServantLocatorI()
adapter.addServantLocator(loc, "x")
diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py
index b20b8f69998..8828ef9d93c 100644
--- a/py/test/Ice/exceptions/Collocated.py
+++ b/py/test/Ice/exceptions/Collocated.py
@@ -27,7 +27,7 @@ import Test, TestI, AllTests
def run(args, communicator):
properties = communicator.getProperties()
properties.setProperty("Ice.Warn.Dispatch", "0")
- properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
+ properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000")
adapter = communicator.createObjectAdapter("TestAdapter")
object = TestI.ThrowerI(adapter)
adapter.add(object, communicator.stringToIdentity("thrower"))
diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py
index a3cb4d4bd06..d67f51d4740 100644
--- a/py/test/Ice/exceptions/Server.py
+++ b/py/test/Ice/exceptions/Server.py
@@ -27,7 +27,7 @@ import Test, TestI
def run(args, communicator):
properties = communicator.getProperties()
properties.setProperty("Ice.Warn.Dispatch", "0")
- properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
+ properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
adapter = communicator.createObjectAdapter("TestAdapter")
object = TestI.ThrowerI(adapter)
adapter.add(object, communicator.stringToIdentity("thrower"))
diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py
index 8918b9285a1..c1789f36796 100644
--- a/py/test/Ice/exceptions/ServerAMD.py
+++ b/py/test/Ice/exceptions/ServerAMD.py
@@ -125,7 +125,7 @@ class ThrowerI(Test.Thrower):
def run(args, communicator):
properties = communicator.getProperties()
properties.setProperty("Ice.Warn.Dispatch", "0")
- properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
+ properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
adapter = communicator.createObjectAdapter("TestAdapter")
object = ThrowerI(adapter)
adapter.add(object, communicator.stringToIdentity("thrower"))