Fixed IceBox/configuration test failure when run with --protocol=ssl

10 files changed, 15 insertions, 15 deletions

diff --git a/cpp/test/IceBox/configuration/AllTests.cpp b/cpp/test/IceBox/configuration/AllTests.cpp
index 4fb796d59dc..7e35bc41552 100644
--- a/cpp/test/IceBox/configuration/AllTests.cpp
+++ b/cpp/test/IceBox/configuration/AllTests.cpp
@@ -17,10 +17,10 @@ using namespace Test;
 void
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    TestIntfPrx service1 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:default -p 12010"));
-    TestIntfPrx service2 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:default -p 12011"));
-    TestIntfPrx service3 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:default -p 12012"));
-    TestIntfPrx service4 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:default -p 12013"));
+    TestIntfPrx service1 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:tcp -p 12010"));
+    TestIntfPrx service2 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:tcp -p 12011"));
+    TestIntfPrx service3 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:tcp -p 12012"));
+    TestIntfPrx service4 = TestIntfPrx::uncheckedCast(communicator->stringToProxy("test:tcp -p 12013"));
 
     if(service1->getProperty("IceBox.InheritProperties") == "")
     {
diff --git a/cpp/test/IceBox/configuration/Client.cpp b/cpp/test/IceBox/configuration/Client.cpp
index 66742b16a9c..cd21712807a 100644
--- a/cpp/test/IceBox/configuration/Client.cpp
+++ b/cpp/test/IceBox/configuration/Client.cpp
@@ -16,15 +16,15 @@ using namespace std;
 using namespace Test;
 
 int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+run(int argc, char* argv[], const Ice::CommunicatorPtr& comm)
 {
     void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
+    allTests(comm);
 
     //
     // Shutdown the IceBox server. 
     //
-    Ice::ProcessPrx::uncheckedCast(communicator->stringToProxy("DemoIceBox/admin -f Process:tcp -p 9996"))->shutdown();
+    Ice::ProcessPrx::uncheckedCast(comm->stringToProxy("DemoIceBox/admin -f Process:default -p 9996"))->shutdown();
 
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/IceBox/configuration/config.icebox b/cpp/test/IceBox/configuration/config.icebox
index e0730c3feb9..bdaa4739d06 100644
--- a/cpp/test/IceBox/configuration/config.icebox
+++ b/cpp/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=TestService:create --Ice.Config=config.service1 --Service1.ArgProp=1 --Service1.Ovrd=2 --Service1.Unset= -a --Arg=2
diff --git a/cpp/test/IceBox/configuration/config.icebox2 b/cpp/test/IceBox/configuration/config.icebox2
index 67b703e2205..8521437da6b 100644
--- a/cpp/test/IceBox/configuration/config.icebox2
+++ b/cpp/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/cpp/test/IceBox/configuration/config.service1 b/cpp/test/IceBox/configuration/config.service1
index 0f1b89ee285..6028e615ff5 100644
--- a/cpp/test/IceBox/configuration/config.service1
+++ b/cpp/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/cpp/test/IceBox/configuration/config.service1-2 b/cpp/test/IceBox/configuration/config.service1-2
index b27f68baf91..1e3cab61de8 100644
--- a/cpp/test/IceBox/configuration/config.service1-2
+++ b/cpp/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/cpp/test/IceBox/configuration/config.service2 b/cpp/test/IceBox/configuration/config.service2
index 3c89982e0c4..78e08aadba6 100644
--- a/cpp/test/IceBox/configuration/config.service2
+++ b/cpp/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/cpp/test/IceBox/configuration/config.service2-2 b/cpp/test/IceBox/configuration/config.service2-2
index 0e9f15f74b1..c700fccea0b 100644
--- a/cpp/test/IceBox/configuration/config.service2-2
+++ b/cpp/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/cpp/test/IceBox/configuration/config.service3 b/cpp/test/IceBox/configuration/config.service3
index 6e6db3dd30b..f1930e3d8fb 100644
--- a/cpp/test/IceBox/configuration/config.service3
+++ b/cpp/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/cpp/test/IceBox/configuration/config.service4 b/cpp/test/IceBox/configuration/config.service4
index 5c1d0b0bee5..182fb3a7289 100644
--- a/cpp/test/IceBox/configuration/config.service4
+++ b/cpp/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