summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/test/IceBox/configuration/AllTests.java8
-rw-r--r--java/test/IceBox/configuration/Client.java2
-rw-r--r--java/test/IceBox/configuration/config.icebox2
-rw-r--r--java/test/IceBox/configuration/config.icebox22
-rw-r--r--java/test/IceBox/configuration/config.service12
-rw-r--r--java/test/IceBox/configuration/config.service1-22
-rw-r--r--java/test/IceBox/configuration/config.service22
-rw-r--r--java/test/IceBox/configuration/config.service2-22
-rw-r--r--java/test/IceBox/configuration/config.service32
-rw-r--r--java/test/IceBox/configuration/config.service42
10 files changed, 13 insertions, 13 deletions
diff --git a/java/test/IceBox/configuration/AllTests.java b/java/test/IceBox/configuration/AllTests.java
index 0c710b4684f..69b466e8b95 100644
--- a/java/test/IceBox/configuration/AllTests.java
+++ b/java/test/IceBox/configuration/AllTests.java
@@ -23,10 +23,10 @@ public class AllTests
public static void
allTests(Ice.Communicator communicator)
{
- TestIntfPrx service1 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:default -p 12010"));
- TestIntfPrx service2 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:default -p 12011"));
- TestIntfPrx service3 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:default -p 12012"));
- TestIntfPrx service4 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:default -p 12013"));
+ TestIntfPrx service1 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:tcp -p 12010"));
+ TestIntfPrx service2 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:tcp -p 12011"));
+ TestIntfPrx service3 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:tcp -p 12012"));
+ TestIntfPrx service4 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:tcp -p 12013"));
if(service1.getProperty("IceBox.InheritProperties").equals(""))
{
diff --git a/java/test/IceBox/configuration/Client.java b/java/test/IceBox/configuration/Client.java
index 29e83349cd4..9c8367b616d 100644
--- a/java/test/IceBox/configuration/Client.java
+++ b/java/test/IceBox/configuration/Client.java
@@ -20,7 +20,7 @@ public class Client
// Shutdown the IceBox server.
//
Ice.ProcessPrxHelper.uncheckedCast(
- communicator.stringToProxy("DemoIceBox/admin -f Process:tcp -p 9996")).shutdown();
+ communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
return 0;
}
diff --git a/java/test/IceBox/configuration/config.icebox b/java/test/IceBox/configuration/config.icebox
index 8f22946a2f8..0cc9851d84c 100644
--- a/java/test/IceBox/configuration/config.icebox
+++ b/java/test/IceBox/configuration/config.icebox
@@ -1,5 +1,5 @@
Ice.Admin.InstanceName=DemoIceBox
-Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
+Ice.Admin.Endpoints=default -p 9996 -h 127.0.0.1
Ice.ProgramName=IceBox
IceBox.Service.Service1=TestServiceI --Ice.Config=config.service1 --Service1.ArgProp=1 --Service1.Ovrd=2 --Service1.Unset= -a --Arg=2
diff --git a/java/test/IceBox/configuration/config.icebox2 b/java/test/IceBox/configuration/config.icebox2
index b77388e8615..b94a1152b65 100644
--- a/java/test/IceBox/configuration/config.icebox2
+++ b/java/test/IceBox/configuration/config.icebox2
@@ -1,5 +1,5 @@
Ice.Admin.InstanceName=DemoIceBox
-Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
+Ice.Admin.Endpoints=default -p 9996 -h 127.0.0.1
Ice.ProgramName=IceBox2
IceBox.InheritProperties=1
diff --git a/java/test/IceBox/configuration/config.service1 b/java/test/IceBox/configuration/config.service1
index 0f1b89ee285..6028e615ff5 100644
--- a/java/test/IceBox/configuration/config.service1
+++ b/java/test/IceBox/configuration/config.service1
@@ -1,4 +1,4 @@
-Service1OA.Endpoints=default -p 12010
+Service1OA.Endpoints=tcp -p 12010 -h 127.0.0.1
#Ice.ProgramName
Service=1
diff --git a/java/test/IceBox/configuration/config.service1-2 b/java/test/IceBox/configuration/config.service1-2
index b27f68baf91..1e3cab61de8 100644
--- a/java/test/IceBox/configuration/config.service1-2
+++ b/java/test/IceBox/configuration/config.service1-2
@@ -1,4 +1,4 @@
-Service1OA.Endpoints=default -p 12010
+Service1OA.Endpoints=tcp -p 12010 -h 127.0.0.1
#Ice.ProgramName
Service1.Prop=1
diff --git a/java/test/IceBox/configuration/config.service2 b/java/test/IceBox/configuration/config.service2
index 3c89982e0c4..78e08aadba6 100644
--- a/java/test/IceBox/configuration/config.service2
+++ b/java/test/IceBox/configuration/config.service2
@@ -1,4 +1,4 @@
-Service2OA.Endpoints=default -p 12011
+Service2OA.Endpoints=tcp -p 12011 -h 127.0.0.1
Ice.ProgramName=Test
Service=2
diff --git a/java/test/IceBox/configuration/config.service2-2 b/java/test/IceBox/configuration/config.service2-2
index 0e9f15f74b1..c700fccea0b 100644
--- a/java/test/IceBox/configuration/config.service2-2
+++ b/java/test/IceBox/configuration/config.service2-2
@@ -1,4 +1,4 @@
-Service2OA.Endpoints=default -p 12011
+Service2OA.Endpoints=tcp -p 12011 -h 127.0.0.1
#Ice.ProgramName
Service2.Prop=1
diff --git a/java/test/IceBox/configuration/config.service3 b/java/test/IceBox/configuration/config.service3
index 6e6db3dd30b..f1930e3d8fb 100644
--- a/java/test/IceBox/configuration/config.service3
+++ b/java/test/IceBox/configuration/config.service3
@@ -1,4 +1,4 @@
-Service3OA.Endpoints=default -p 12012
+Service3OA.Endpoints=tcp -p 12012 -h 127.0.0.1
#Ice.ProgramName
Service=3
diff --git a/java/test/IceBox/configuration/config.service4 b/java/test/IceBox/configuration/config.service4
index 5c1d0b0bee5..182fb3a7289 100644
--- a/java/test/IceBox/configuration/config.service4
+++ b/java/test/IceBox/configuration/config.service4
@@ -1,4 +1,4 @@
-Service4OA.Endpoints=default -p 12013
+Service4OA.Endpoints=tcp -p 12013 -h 127.0.0.1
#Ice.ProgramName
Service=4