5 files changed, 13 insertions, 8 deletions
diff --git a/cpp/demo/IceStorm/counter/expect.py b/cpp/demo/IceStorm/counter/expect.py
index 98e2e7c0a1f..f1255c3fd56 100755
--- a/cpp/demo/IceStorm/counter/expect.py
+++ b/cpp/demo/IceStorm/counter/expect.py
@@ -79,6 +79,7 @@ print("ok")
 server.kill(signal.SIGINT)
 server.waitTestSuccess()
 
-admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.icebox shutdown')
+admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox/admin \
+  -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1" shutdown')
 admin.waitTestSuccess()
 icestorm.waitTestSuccess()
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py
index b16cbb5c516..a4f747223de 100755
--- a/cpp/demo/IceStorm/replicated/expect.py
+++ b/cpp/demo/IceStorm/replicated/expect.py
@@ -79,7 +79,7 @@ icestorm3 = Util.watch("db/DemoIceStorm-3.out")
 icestorm1.expect('Election: node 1: reporting for duty in group 3:[-0-9A-Fa-f]+ with coordinator 3', timeout = 60)
 icestorm2.expect('Election: node 2: reporting for duty in group 3:[-0-9A-Fa-f]+ with coordinator 3', timeout = 60)
 icestorm3.expect('Election: node 3: reporting for duty in group 3:[-0-9A-Fa-f]+ as coordinator', timeout = 60)
-         
+
 icestorm3.expect('DemoIceStorm-3-IceStorm: Topic: time: subscribeAndGetPublisher: [-0-9A-Fa-f]+', timeout = 60)
 icestorm1.expect('DemoIceStorm-1-IceStorm: Topic: time: add replica observer: [-0-9A-Fa-f]+', timeout = 60)
 icestorm2.expect('DemoIceStorm-2-IceStorm: Topic: time: add replica observer: [-0-9A-Fa-f]+', timeout = 60)
diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3
index 2da9ad9d0d3..9ff9a7d9e88 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib3
+++ b/cpp/demo/IceStorm/replicated2/config.ib3
@@ -1,7 +1,7 @@
 #
 # Enable Ice.Admin object
 #
-Ice.Admin.Endpoints=tcp -p 9993
+Ice.Admin.Endpoints=tcp -p 9992
 Ice.Admin.InstanceName=icebox3
 
 #
diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py
index b42877a6efc..57f592df516 100755
--- a/cpp/demo/IceStorm/replicated2/expect.py
+++ b/cpp/demo/IceStorm/replicated2/expect.py
@@ -82,11 +82,14 @@ ib1.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+')
 ib2.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+')
 ib3.expect('Topic: time: unsubscribe: [-0-9A-Fa-f]+')
 
-admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib1 shutdown')
+admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox1/admin \
+  -f IceBox.ServiceManager:tcp -p 9990 -h 127.0.0.1" shutdown')
 admin.waitTestSuccess()
-admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib2 shutdown')
+admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox2/admin \
+  -f IceBox.ServiceManager:tcp -p 9991 -h 127.0.0.1" shutdown')
 admin.waitTestSuccess()
-admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib3 shutdown')
+admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox3/admin \
+  -f IceBox.ServiceManager:tcp -p 9992 -h 127.0.0.1" shutdown')
 admin.waitTestSuccess()
 
 ib1.waitTestSuccess()
diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py
index 22746867e8a..24cd44a4702 100755
--- a/demoscript/IceStorm/clock.py
+++ b/demoscript/IceStorm/clock.py
@@ -47,7 +47,7 @@ def run(subCmd, pubCmd):
         args = ''
 
     icestorm = Util.spawn('%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s' % (Util.getIceBox(), args))
-                          
+
     icestorm.expect('.* ready')
 
     runtest(icestorm, subCmd, "", pubCmd, "")
@@ -59,6 +59,7 @@ def run(subCmd, pubCmd):
     for s in pubargs:
         runtest(icestorm, subCmd, "", pubCmd, s)
 
-    admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.icebox shutdown')
+    admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox/admin \
+        -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1" shutdown')
     admin.waitTestSuccess()
     icestorm.waitTestSuccess()