Added expect scripts for IceDiscovery demos and also fixed couple of issues in demos themselves.

1 files changed, 11 insertions, 7 deletions

diff --git a/java/demo/IceDiscovery/replication/expect.py b/java/demo/IceDiscovery/replication/expect.py
index af25a3ce17c..2c11864c620 100755
--- a/java/demo/IceDiscovery/replication/expect.py
+++ b/java/demo/IceDiscovery/replication/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -20,11 +20,15 @@ if len(path) == 0:
 sys.path.append(path[0])
 
 from demoscript import Util
-from demoscript.Ice import hello
+from demoscript.IceDiscovery import replication
 
-server = Util.spawn('server.exe --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
-server.expect('.* ready')
-client = Util.spawn('client.exe --Ice.Warn.Connections=0')
-client.expect('.*==>')
+server1 = Util.spawn('java Server --Ice.Config=config.server1 --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
+server1.expect('.* ready')
+server2 = Util.spawn('java Server --Ice.Config=config.server2 --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
+server2.expect('.* ready')
+server3 = Util.spawn('java Server --Ice.Config=config.server3 --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
+server3.expect('.* ready')
+client = Util.spawn('java Client --Ice.Warn.Connections=0')
+client.expect('enter the number of iterations:')
 
-hello.run(client, server)
+replication.run(client, server1, server2, server3)