diff options
Diffstat (limited to 'java/test')
3 files changed, 9 insertions, 7 deletions
diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java index e80eac3b70d..a3366e56433 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java @@ -54,6 +54,8 @@ public class Client extends test.Util.Application public int run(String[] args) { String protocol = communicator().getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp"); + String host = communicator().getProperties().getPropertyWithDefault("Ice.Default.Host", "127.0.0.1"); + _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { @Override @@ -168,7 +170,7 @@ public class Client extends test.Util.Application { out.print("testing SessionHelper connect... "); out.flush(); - _factory.setRouterHost("127.0.0.1"); + _factory.setRouterHost(host); _factory.setPort(12347); _factory.setProtocol(protocol); _session = _factory.connect("userid", "abc123"); @@ -212,7 +214,7 @@ public class Client extends test.Util.Application out.print("testing stringToProxy for server object... "); out.flush(); - Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:tcp -p 12010"); + Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:default -p 12010"); out.println("ok"); out.print("pinging server after session creation... "); @@ -289,7 +291,7 @@ public class Client extends test.Util.Application Ice.ObjectPrx processBase; { out.print("testing stringToProxy for process object... "); - processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); + processBase = communicator().stringToProxy("Glacier2/admin -f Process:default -h \"" + host + "\" -p 12348"); out.println("ok"); } @@ -382,7 +384,7 @@ public class Client extends test.Util.Application out.print("testing SessionHelper connect after router shutdown... "); out.flush(); - _factory.setRouterHost("127.0.0.1"); + _factory.setRouterHost(host); _factory.setPort(12347); _factory.setProtocol(protocol); _session = _factory.connect("userid", "abc123"); diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java index 0429387cb80..5d043e27165 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java @@ -14,7 +14,7 @@ public class Server extends test.Util.Application public int run(String[] args) { - communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); + communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), communicator().stringToIdentity("callback")); adapter.activate(); diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/run.py b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py index ddb8006f352..f5bfff385c0 100755 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/run.py +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py @@ -27,8 +27,8 @@ args = ' --Ice.Warn.Dispatch=0' + \ ' --Ice.Warn.Connections=0' + \ ' --Glacier2.SessionTimeout="30"' + \ ' --Glacier2.Client.Endpoints="default -p 12347"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ + ' --Glacier2.Server.Endpoints="default"' \ + ' --Ice.Admin.Endpoints="default -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' |