summaryrefslogtreecommitdiff
path: root/cs/config/IceGridAdmin.py
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 /cs/config/IceGridAdmin.py
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 'cs/config/IceGridAdmin.py')
-rw-r--r--cs/config/IceGridAdmin.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cs/config/IceGridAdmin.py b/cs/config/IceGridAdmin.py
index 0e6fa9e3313..203b1fcfa19 100644
--- a/cs/config/IceGridAdmin.py
+++ b/cs/config/IceGridAdmin.py
@@ -27,7 +27,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' + \
@@ -41,9 +41,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.Node=0' + \
@@ -67,7 +67,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")