Changing demo and test port numbers.

56 files changed, 94 insertions, 94 deletions

diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp
index 00390211b8d..f767c7f6892 100644
--- a/cpp/test/Freeze/evictor/Client.cpp
+++ b/cpp/test/Freeze/evictor/Client.cpp
@@ -359,7 +359,7 @@ private:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    string ref = "factory:default -p 12345 -t 30000";
+    string ref = "factory:default -p 12010 -t 30000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base);
diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp
index d5733169719..cd0864cc831 100644
--- a/cpp/test/Freeze/evictor/Server.cpp
+++ b/cpp/test/Freeze/evictor/Server.cpp
@@ -50,7 +50,7 @@ public:
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName)
 {
-    communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12345 -t 30000");
+    communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory");
 
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index 8f5ee161c8b..e4a45223ad2 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -137,7 +137,7 @@ CallbackClient::run(int argc, char* argv[])
 
     {
 	cout << "testing stringToProxy for server object... " << flush;
-	base = communicator()->stringToProxy("c1/callback:tcp -p 12345 -t 10000");
+	base = communicator()->stringToProxy("c1/callback:tcp -p 12010 -t 10000");
 	cout << "ok" << endl;
     }
 	
diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp
index 6d96b5983be..fb1c4411649 100644
--- a/cpp/test/Glacier2/router/Server.cpp
+++ b/cpp/test/Glacier2/router/Server.cpp
@@ -31,7 +31,7 @@ main(int argc, char* argv[])
 int
 CallbackServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12345 -t 10000");
+    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000");
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter");
     adapter->add(new CallbackI(), stringToIdentity("c1/callback")); // The test allows "c1" as category.
     adapter->add(new CallbackI(), stringToIdentity("c2/callback")); // The test allows "c2" as category.
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index 5b9f3b6929a..e9941165368 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -19,7 +19,7 @@ TestIntfPrx
 allTests(const CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    ObjectPrx base = communicator->stringToProxy("test:default -p 12345 -t 10000");
+    ObjectPrx base = communicator->stringToProxy("test:default -p 12010 -t 10000");
     test(base);
     cout << "ok" << endl;
 
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 00bedd6f12f..eaf1ee6f889 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -33,7 +33,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = new ServantLocatorI;
     adapter->addServantLocator(locator, "");
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index a19470952eb..b340d06fb5d 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -31,7 +31,7 @@ main(int argc, char* argv[])
 int
 TestServer::run(int argc, char* argv[])
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = new ServantLocatorI;
     
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index e58bfa347d8..e2c02cebd4c 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -40,7 +40,7 @@ deactivate(const RemoteCommunicatorPrx& com, vector<RemoteObjectAdapterPrx>& ada
 void
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    string ref = "communicator:default -p 12345 -t 10000";
+    string ref = "communicator:default -p 12010 -t 10000";
     RemoteCommunicatorPrx com = RemoteCommunicatorPrx::uncheckedCast(communicator->stringToProxy(ref));
 
     cout << "testing binding with single endpoint... " << flush;
diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp
index 143c58cb3f8..ab20a16b40e 100644
--- a/cpp/test/Ice/binding/Server.cpp
+++ b/cpp/test/Ice/binding/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("communicator");
     adapter->add(new RemoteCommunicatorI(), id);
diff --git a/cpp/test/Ice/checksum/client/AllTests.cpp b/cpp/test/Ice/checksum/client/AllTests.cpp
index 238a7be2654..b98a6c32785 100644
--- a/cpp/test/Ice/checksum/client/AllTests.cpp
+++ b/cpp/test/Ice/checksum/client/AllTests.cpp
@@ -17,7 +17,7 @@ using namespace std;
 Test::ChecksumPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
-    string ref = "test:default -p 12345 -t 10000";
+    string ref = "test:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
 
diff --git a/cpp/test/Ice/checksum/server/Server.cpp b/cpp/test/Ice/checksum/server/Server.cpp
index 4dbb4e8d1ea..79e79503757 100644
--- a/cpp/test/Ice/checksum/server/Server.cpp
+++ b/cpp/test/Ice/checksum/server/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ChecksumI(adapter);
     adapter->add(object, Ice::stringToIdentity("test"));
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index d9bfee95252..03770c2dd58 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -855,7 +855,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = communicator->getProperties()->getPropertyWithDefault(
-	"Custom.Proxy", "test:default -p 12345 -t 10000");
+	"Custom.Proxy", "test:default -p 12010 -t 10000");
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -1288,11 +1288,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 
     {
         deque<Test::CPrx> in(5);
-	in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12345 -t 10000"));
-	in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12345 -t 10001"));
-	in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12345 -t 10002"));
-	in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12345 -t 10003"));
-	in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12345 -t 10004"));
+	in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"));
+	in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"));
+	in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"));
+	in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"));
+	in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"));
 
 	deque<Test::CPrx> out;
 	deque<Test::CPrx> ret = t->opCPrxSeq(in, out);
@@ -1302,11 +1302,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 
     {
         list<Test::CPrx> in;
-	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12345 -t 10000")));
-	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12345 -t 10001")));
-	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12345 -t 10002")));
-	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12345 -t 10003")));
-	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12345 -t 10004")));
+	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")));
+	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")));
+	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")));
+	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")));
+	in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")));
 
 	list<Test::CPrx> out;
 	list<Test::CPrx> ret = t->opCPrxList(in, out);
@@ -1735,11 +1735,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 
         {
             deque<Test::CPrx> in(5);
-	    in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12345 -t 10000"));
-	    in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12345 -t 10001"));
-	    in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12345 -t 10002"));
-	    in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12345 -t 10003"));
-	    in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12345 -t 10004"));
+	    in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"));
+	    in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"));
+	    in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"));
+	    in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"));
+	    in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"));
 
 	    AMI_TestIntf_opCPrxSeqIPtr cb = new AMI_TestIntf_opCPrxSeqI(in);
 	    t->opCPrxSeq_async(cb, in);
@@ -1748,11 +1748,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 
         {
             list<Test::CPrx> in;
-	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12345 -t 10000")));
-	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12345 -t 10001")));
-	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12345 -t 10002")));
-	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12345 -t 10003")));
-	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12345 -t 10004")));
+	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")));
+	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")));
+	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")));
+	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")));
+	    in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")));
 
 	    AMI_TestIntf_opCPrxListIPtr cb = new AMI_TestIntf_opCPrxListI(in);
 	    t->opCPrxList_async(cb, in);
diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp
index 6cbd32a7316..3f793483920 100644
--- a/cpp/test/Ice/custom/Collocated.cpp
+++ b/cpp/test/Ice/custom/Collocated.cpp
@@ -35,7 +35,7 @@ main(int argc, char** argv)
     try
     {
         Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
         communicator = Ice::initialize(argc, argv);
         status = run(argc, argv, communicator);
diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp
index 05d8c9a227e..334d6631310 100644
--- a/cpp/test/Ice/custom/Server.cpp
+++ b/cpp/test/Ice/custom/Server.cpp
@@ -34,7 +34,7 @@ main(int argc, char** argv)
     try
     {
         Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
         communicator = Ice::initialize(argc, argv);
         status = run(argc, argv, communicator);
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index d6fea972523..cbff3c10912 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -34,7 +34,7 @@ main(int argc, char** argv)
     try
     {
         Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
         communicator = Ice::initialize(argc, argv);
         status = run(argc, argv, communicator);
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index c4ed6ef4887..c8b6b882485 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -578,7 +578,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 	try
 	{
 	    Ice::ObjectAdapterPtr second = 
-		communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12346 -t 10000");
+		communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000");
 	    test(false);
 	}
 	catch(const Ice::AlreadyRegisteredException&)
@@ -665,7 +665,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     cout << "ok" << endl;
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "thrower:default -p 12345 -t 10000";
+    string ref = "thrower:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 94173928cb5..bed496182d7 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, Ice::stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index abaca51d19e..4e58d03b226 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, Ice::stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 12858defc46..c781fcc5e53 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, Ice::stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 982da0bf97f..8ffc1fc0677 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -76,7 +76,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     adapter->deactivate();
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "d:default -p 12345 -t 10000";
+    string ref = "d:default -p 12010 -t 10000";
     Ice::ObjectPrx db = communicator->stringToProxy(ref);
     test(db);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index d0561e5147e..3b1144ede61 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = new DI;
     adapter->add(d, Ice::stringToIdentity("d"));
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index cc7c2777b10..8453a059232 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = new DI;
     adapter->add(d, Ice::stringToIdentity("d"));
diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp
index 47aa8394274..b6b19fd6f65 100644
--- a/cpp/test/Ice/hold/AllTests.cpp
+++ b/cpp/test/Ice/hold/AllTests.cpp
@@ -18,7 +18,7 @@ void
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "hold:default -p 12345 -t 10000";
+    string ref = "hold:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp
index ea9045d2dd2..c9e34e239b9 100644
--- a/cpp/test/Ice/hold/Server.cpp
+++ b/cpp/test/Ice/hold/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new HoldI;
     adapter->add(object, Ice::stringToIdentity("hold"));
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 5ea28cf48e7..9f69f4d7008 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -18,7 +18,7 @@ InitialPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:default -p 12345 -t 10000";
+    string ref = "initial:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 0b3e6acc9c4..219057cb660 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new InitialI(adapter);
     adapter->add(object, Ice::stringToIdentity("initial"));
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index 470a6cca2bd..6fa5e7d7797 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new InitialI(adapter);
     adapter->add(object, Ice::stringToIdentity("initial"));
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index c7c09c8a699..4a84d07d1c9 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -17,7 +17,7 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     void allTests(const Ice::CommunicatorPtr&, const string&);
-    allTests(communicator, "ServerManager:default -p 12345 -t 10000");
+    allTests(communicator, "ServerManager:default -p 12010 -t 10000");
     return EXIT_SUCCESS;
 }
 
@@ -30,7 +30,7 @@ main(int argc, char* argv[])
     try
     {
 	Ice::PropertiesPtr properties = Ice::createProperties(argc, argv);
-	properties->setProperty("Ice.Default.Locator", "locator:default -p 12345");
+	properties->setProperty("Ice.Default.Locator", "locator:default -p 12010");
 	communicator = Ice::initializeWithProperties(argc, argv, properties);
 	status = run(argc, argv, communicator);
     }
diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index 8f16022af08..512d5319b35 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/Server.cpp
@@ -23,7 +23,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     //
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.ThreadPool.Server.Size", "2");
-    properties->setProperty("ServerManager.Endpoints", "default -p 12345:udp");
+    properties->setProperty("ServerManager.Endpoints", "default -p 12010:udp");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ServerManager");
 
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp
index 99212c3e7db..464342db132 100644
--- a/cpp/test/Ice/location/TestI.cpp
+++ b/cpp/test/Ice/location/TestI.cpp
@@ -50,7 +50,7 @@ ServerManagerI::startServer(const Ice::Current&)
     serverCommunicator->getProperties()->setProperty("TestAdapter2.AdapterId", "TestAdapter2");
     Ice::ObjectAdapterPtr adapter2 = serverCommunicator->createObjectAdapter("TestAdapter2");
 
-    Ice::ObjectPrx locator = serverCommunicator->stringToProxy("locator:default -p 12345");
+    Ice::ObjectPrx locator = serverCommunicator->stringToProxy("locator:default -p 12010");
     adapter->setLocator(Ice::LocatorPrx::uncheckedCast(locator));
     adapter2->setLocator(Ice::LocatorPrx::uncheckedCast(locator));
 
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index a9350bb0e92..a2bf2a10863 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -18,7 +18,7 @@ InitialPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:default -p 12345 -t 10000";
+    string ref = "initial:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index f5b2a6dbb92..e205949e554 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     InitialPtr initial = new InitialI(adapter);
     adapter->add(initial, Ice::stringToIdentity("initial"));
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index 69f0e827bf4..477883251fe 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -16,7 +16,7 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     InitialPtr initial = new InitialI(adapter);
     adapter->add(initial, Ice::stringToIdentity("initial"));
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 80827e63341..60caada9599 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -18,7 +18,7 @@ Test::MyClassPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref = "test:default -p 12345 -t 10000";
+    string ref = "test:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -74,7 +74,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     cout << "ok" << endl;
 
     cout << "testing checked cast with context... " << flush;
-    string cref = "context:default -p 12345 -t 10000";
+    string cref = "context:default -p 12010 -t 10000";
     Ice::ObjectPrx cbase = communicator->stringToProxy(cref);
     test(cbase);
 
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index 50d8dc7ac11..fafbb1894de 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("test");
     adapter->add(new MyDerivedClassI(adapter, id), id);
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index b14be356aeb..3de4c745cc6 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("test");
     adapter->add(new MyDerivedClassI(adapter, id), id);
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 2254a7f9ad5..4acca84f14b 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -15,7 +15,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000:udp");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("test");
     adapter->add(new MyDerivedClassI(adapter, id), id);
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 64e37f28d5e..24f45018928 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -661,7 +661,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
 	    communicator->setDefaultContext(dflt);
 	    Test::MyClassPrx c = Test::MyClassPrx::checkedCast(
-	    				communicator->stringToProxy("test:default -p 12345 -t 10000"));
+	    				communicator->stringToProxy("test:default -p 12010 -t 10000"));
 	    test(c->opContext() == dflt);
 
 	    dflt["a"] = "c";
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 456ed9e5e80..4b56820a9e8 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1234,7 +1234,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
 	    communicator->setDefaultContext(dflt);
 	    Test::MyClassPrx c = Test::MyClassPrx::checkedCast(
-				    communicator->stringToProxy("test:default -p 12345 -t 10000"));
+				    communicator->stringToProxy("test:default -p 12010 -t 10000"));
 	    {
 		Ice::Context tmp;
 		tmp["a"] = "b";
diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
index 0dd7f9f63b7..9cccb6daec0 100644
--- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
@@ -469,7 +469,7 @@ typedef IceUtil::Handle<AMI_Test_unknownMostDerived2AsBaseI> AMI_Test_unknownMos
 TestIntfPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    Ice::ObjectPrx obj = communicator->stringToProxy("Test:default -p 12345");
+    Ice::ObjectPrx obj = communicator->stringToProxy("Test:default -p 12010");
     TestIntfPrx test = TestIntfPrx::checkedCast(obj);
 
     cout << "base... " << flush;
diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp
index 1af548c6d28..5b50c786528 100644
--- a/cpp/test/Ice/slicing/exceptions/Server.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Server.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new TestI(adapter);
     adapter->add(object, Ice::stringToIdentity("Test"));
diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
index 9b2695e2eac..4b0de4a06c4 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new TestI(adapter);
     adapter->add(object, Ice::stringToIdentity("Test"));
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index 68079812d28..a35c95638dc 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -628,7 +628,7 @@ typedef IceUtil::Handle<AMI_Test_useForwardI> AMI_Test_useForwardIPtr;
 TestIntfPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    Ice::ObjectPrx obj = communicator->stringToProxy("Test:default -p 12345");
+    Ice::ObjectPrx obj = communicator->stringToProxy("Test:default -p 12010");
     TestIntfPrx test = TestIntfPrx::checkedCast(obj);
 
     cout << "base as Object... " << flush;
diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp
index 1af548c6d28..5b50c786528 100644
--- a/cpp/test/Ice/slicing/objects/Server.cpp
+++ b/cpp/test/Ice/slicing/objects/Server.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new TestI(adapter);
     adapter->add(object, Ice::stringToIdentity("Test"));
diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
index 9b2695e2eac..4b0de4a06c4 100644
--- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
@@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new TestI(adapter);
     adapter->add(object, Ice::stringToIdentity("Test"));
diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py
index 7d73bf25a89..d4ae1df4344 100755
--- a/cpp/test/IceGrid/activation/run.py
+++ b/cpp/test/IceGrid/activation/run.py
@@ -28,14 +28,14 @@ testdir = os.path.join(toplevel, "test", name)
 # Add locator options for the client and server. Since the server
 # invokes on the locator it's also considered to be a client.
 #
-additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\""
+additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\""
 
 IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
 
 #
 # Start IceGrid registry and a node.
 #
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 0)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
 iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
 
 #
diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py
index f02eec914e7..800e4c3ec4f 100755
--- a/cpp/test/IceGrid/deployer/run.py
+++ b/cpp/test/IceGrid/deployer/run.py
@@ -42,7 +42,7 @@ def startClient(options):
     global testdir
 
     fullClientOptions = TestUtil.clientOptions + \
-                        " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\" " + \
+                        " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\" " + \
                         options
 
     print "starting client...",
@@ -58,7 +58,7 @@ def startClient(options):
 # Start IceGrid.
 #
 IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 0)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
 iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
 
 #
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py
index c0be85fae42..f0fd00b6819 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -48,11 +48,11 @@ else:
 # a bit of time for the IceGrid node to detect that the server is down
 # and to return a direct proxy from an active server.
 #
-additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\"" + \
+additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\"" + \
                     " --Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0 --Ice.RetryIntervals=\"0 50 100 250\""
 
 IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 0)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
 iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
 
 print "registering application with icegrid...",
diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py
index 2f139f354d1..f73c48f04d9 100755
--- a/cpp/test/IceGrid/session/run.py
+++ b/cpp/test/IceGrid/session/run.py
@@ -29,11 +29,11 @@ client = os.path.join(testdir, "client")
 # Add locator options for the client and server. Since the server
 # invokes on the locator it's also considered to be a client.
 #
-additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\" " + \
+additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\" " + \
     "--Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0 --IceDir=\"" + toplevel + "\" --TestDir=\"" + testdir + "\""
 
 IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 0)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
 iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
 
 node1Dir = os.path.join(testdir, "db", "node-1")
diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py
index e0610a8dd73..fa8549b4719 100755
--- a/cpp/test/IceGrid/simple/run.py
+++ b/cpp/test/IceGrid/simple/run.py
@@ -28,14 +28,14 @@ testdir = os.path.join(toplevel, "test", name)
 # Add locator options for the client and server. Since the server
 # invokes on the locator it's also considered to be a client.
 #
-additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\""
+additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\""
 
 IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
 
 #
 # Start IceGrid registry.
 # 
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 1)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 1)
 
 #
 # Test client/server without on demand activation.
@@ -54,7 +54,7 @@ IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
 #
 # Start IceGrid registry and a node.
 #
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 0)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
 iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
 
 #
diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py
index 09160a839fc..206e613e01a 100755
--- a/cpp/test/IceGrid/update/run.py
+++ b/cpp/test/IceGrid/update/run.py
@@ -29,11 +29,11 @@ client = os.path.join(testdir, "client")
 # Add locator options for the client and server. Since the server
 # invokes on the locator it's also considered to be a client.
 #
-additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12345\" " + \
+additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\" " + \
     "--Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0 --IceDir=\"" + toplevel + "\" --TestDir=\"" + testdir + "\""
 
 IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12345", testdir, 0)
+iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
 iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
 
 node1Dir = os.path.join(testdir, "db", "node-1")
diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp
index 714ccc1d201..6b1b23bfb94 100644
--- a/cpp/test/IceSSL/certificateVerification/Client.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Client.cpp
@@ -19,8 +19,8 @@ using namespace Test;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    const string ref1 = "pinger:ssl -p 12345 -t 10000";
-    const string ref2 = "pinger:ssl -p 12346 -t 10000";
+    const string ref1 = "pinger:ssl -p 12010 -t 10000";
+    const string ref2 = "pinger:ssl -p 12011 -t 10000";
     const string ref3 = "pinger:ssl -p 12347 -t 10000";
     const string ref4 = "pinger:ssl -p 12348 -t 10000";
     const string ref5 = "pinger:ssl -p 12349 -t 10000";
diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp
index eedb2190711..01d6b222741 100644
--- a/cpp/test/IceSSL/certificateVerification/Server.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Server.cpp
@@ -152,8 +152,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     kmAdapter->activate();
 
     const string pingerEndpoints =
-	"ssl -p 12345 -t 10000"
-	":ssl -p 12346 -t 10000"
+	"ssl -p 12010 -t 10000"
+	":ssl -p 12011 -t 10000"
 	":ssl -p 12347 -t 10000"
 	":ssl -p 12348 -t 10000"
 	":ssl -p 12349 -t 10000";
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 7deaa667996..ca6e748cb7d 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -28,13 +28,13 @@ iceBox = TestUtil.getIceBox(testdir)
 iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
 iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
 
-iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12345" --Ice.Default.Locator='
+iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator='
 
 iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":create" + \
-                  ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
+                  ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \
                   ' --IceStorm.Publish.Endpoints="default"' + \
                   " --IceBox.PrintServicesReady=IceStorm"
-iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12346"'
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"'
 
 def doTest(batch):
     global testdir
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 24edb4f8121..5c317f7fa08 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -30,13 +30,13 @@ iceBox = TestUtil.getIceBox(exedir)
 iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
 iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
 
-iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12345" --Ice.Default.Locator='
+iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator='
 
 iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":create" + \
-                  ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
+                  ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \
                   ' --IceStorm.Publish.Endpoints="default"' + \
 		  " --IceBox.PrintServicesReady=IceStorm"
-iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12346"'
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"'
 
 def doTest(batch):
     global testdir
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 5c2732eadea..18887dc9021 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -28,13 +28,13 @@ iceBox = TestUtil.getIceBox(testdir)
 iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
 iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
 
-iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12345" --Ice.Default.Locator='
+iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator='
 
 iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":create" + \
-                  ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
+                  ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \
                   ' --IceStorm.Publish.Endpoints="default"' + \
                   " --IceBox.PrintServicesReady=IceStorm"
-iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12346"'
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"'
 
 dbHome = os.path.join(testdir, "db")
 TestUtil.cleanDbDir(dbHome)