Bug 803 - changed communicator initialization

30 files changed, 206 insertions, 160 deletions

diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp
index 303d3f697ad..8f85aad14c1 100755
--- a/cppe/test/Common/TestCommon.cpp
+++ b/cppe/test/Common/TestCommon.cpp
@@ -477,6 +477,12 @@ TestApplication::TestApplication(const std::string& name)
 {
 }
 
+LoggerPtr
+TestApplication::getLogger()
+{
+    return new LoggerI();
+}
+
 void
 TestApplication::setCommunicator(const CommunicatorPtr& communicator)
 {
@@ -487,7 +493,6 @@ TestApplication::setCommunicator(const CommunicatorPtr& communicator)
 	_tprintfp = fopen(("log-" + _name + ".txt").c_str(), "w");
     }
 #endif
-    _communicator->setLogger(new LoggerI);
 
 }
 
diff --git a/cppe/test/IceE/adapterDeactivation/Client.cpp b/cppe/test/IceE/adapterDeactivation/Client.cpp
index a66f18b93dd..bdcc4dab8e9 100644
--- a/cppe/test/IceE/adapterDeactivation/Client.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Client.cpp
@@ -27,9 +27,11 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-	loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+    	Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         TestIntfPrx allTests(const CommunicatorPtr&);
         TestIntfPrx obj = allTests(communicator());
diff --git a/cppe/test/IceE/adapterDeactivation/Collocated.cpp b/cppe/test/IceE/adapterDeactivation/Collocated.cpp
index 4cb0bb519dd..b14404657f0 100644
--- a/cppe/test/IceE/adapterDeactivation/Collocated.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Collocated.cpp
@@ -27,11 +27,13 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new TestI;
diff --git a/cppe/test/IceE/adapterDeactivation/Server.cpp b/cppe/test/IceE/adapterDeactivation/Server.cpp
index 4f10d3c9c9a..8ecf6c1c52c 100644
--- a/cppe/test/IceE/adapterDeactivation/Server.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Server.cpp
@@ -27,11 +27,13 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new TestI;
diff --git a/cppe/test/IceE/custom/Client.cpp b/cppe/test/IceE/custom/Client.cpp
index 54ef21550b0..c80c581c5c4 100644
--- a/cppe/test/IceE/custom/Client.cpp
+++ b/cppe/test/IceE/custom/Client.cpp
@@ -26,10 +26,12 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 
         Test::TestIntfPrx allTests(const Ice::CommunicatorPtr&);
         Test::TestIntfPrx test = allTests(communicator());
diff --git a/cppe/test/IceE/custom/Collocated.cpp b/cppe/test/IceE/custom/Collocated.cpp
index c3582f2925f..7b440949847 100644
--- a/cppe/test/IceE/custom/Collocated.cpp
+++ b/cppe/test/IceE/custom/Collocated.cpp
@@ -27,14 +27,16 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         adapter->add(new TestIntfI(communicator()), Ice::stringToIdentity("test"));
diff --git a/cppe/test/IceE/custom/Server.cpp b/cppe/test/IceE/custom/Server.cpp
index b564ea0543e..ba435f5310b 100644
--- a/cppe/test/IceE/custom/Server.cpp
+++ b/cppe/test/IceE/custom/Server.cpp
@@ -27,14 +27,16 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 	
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         adapter->add(new TestIntfI(communicator()), Ice::stringToIdentity("test"));
diff --git a/cppe/test/IceE/exceptions/Client.cpp b/cppe/test/IceE/exceptions/Client.cpp
index 367fbd2f93a..0019a3bd223 100644
--- a/cppe/test/IceE/exceptions/Client.cpp
+++ b/cppe/test/IceE/exceptions/Client.cpp
@@ -26,9 +26,11 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         ThrowerPrx allTests(const Ice::CommunicatorPtr&);
         ThrowerPrx thrower = allTests(communicator());
diff --git a/cppe/test/IceE/exceptions/Collocated.cpp b/cppe/test/IceE/exceptions/Collocated.cpp
index d8232315a83..ee0603d4a5e 100644
--- a/cppe/test/IceE/exceptions/Collocated.cpp
+++ b/cppe/test/IceE/exceptions/Collocated.cpp
@@ -26,13 +26,15 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-        properties->setProperty("Ice.Warn.Dispatch", "0");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new ThrowerI(adapter);
diff --git a/cppe/test/IceE/exceptions/Server.cpp b/cppe/test/IceE/exceptions/Server.cpp
index f7e7c908cc2..6380523d537 100644
--- a/cppe/test/IceE/exceptions/Server.cpp
+++ b/cppe/test/IceE/exceptions/Server.cpp
@@ -25,12 +25,14 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
-        properties->setProperty("Ice.Warn.Dispatch", "0");
-        properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
+        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new ThrowerI(adapter);
diff --git a/cppe/test/IceE/facets/Client.cpp b/cppe/test/IceE/facets/Client.cpp
index 585786ba180..26bf95a97b5 100644
--- a/cppe/test/IceE/facets/Client.cpp
+++ b/cppe/test/IceE/facets/Client.cpp
@@ -26,9 +26,11 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         GPrx allTests(const Ice::CommunicatorPtr&);
         GPrx g = allTests(communicator());
diff --git a/cppe/test/IceE/facets/Collocated.cpp b/cppe/test/IceE/facets/Collocated.cpp
index 939b9a28221..3057be10780 100644
--- a/cppe/test/IceE/facets/Collocated.cpp
+++ b/cppe/test/IceE/facets/Collocated.cpp
@@ -26,11 +26,13 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr d = new DI;
diff --git a/cppe/test/IceE/facets/Server.cpp b/cppe/test/IceE/facets/Server.cpp
index 4490d0fe357..40948706ea2 100644
--- a/cppe/test/IceE/facets/Server.cpp
+++ b/cppe/test/IceE/facets/Server.cpp
@@ -25,11 +25,13 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr d = new DI;
diff --git a/cppe/test/IceE/faultTolerance/Client.cpp b/cppe/test/IceE/faultTolerance/Client.cpp
index f5f6e3aa67e..891cfc85614 100644
--- a/cppe/test/IceE/faultTolerance/Client.cpp
+++ b/cppe/test/IceE/faultTolerance/Client.cpp
@@ -31,14 +31,15 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+    	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
+        loadConfig(initData.properties);
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
 	//
 	// This test aborts servers, so we don't want warnings.
 	//
-	properties->setProperty("Ice.Warn.Connections", "0");
+	initData.properties->setProperty("Ice.Warn.Connections", "0");
 
         vector<int> ports;
         for(int i = 1; i < argc; ++i)
diff --git a/cppe/test/IceE/faultTolerance/Server.cpp b/cppe/test/IceE/faultTolerance/Server.cpp
index db0abc4ec81..58aaad12c32 100644
--- a/cppe/test/IceE/faultTolerance/Server.cpp
+++ b/cppe/test/IceE/faultTolerance/Server.cpp
@@ -32,9 +32,11 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         int port = 0;
         for(int i = 1; i < argc; ++i)
@@ -65,7 +67,7 @@ public:
 
         char buf[32];
         sprintf(buf, "default -p %d", port);
-        properties->setProperty("TestAdapter.Endpoints", buf);
+        initData.properties->setProperty("TestAdapter.Endpoints", buf);
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new TestI(adapter);
         adapter->add(object, Ice::stringToIdentity("test"));
diff --git a/cppe/test/IceE/inheritance/Client.cpp b/cppe/test/IceE/inheritance/Client.cpp
index 3e63473bba9..edc2dc0a23a 100644
--- a/cppe/test/IceE/inheritance/Client.cpp
+++ b/cppe/test/IceE/inheritance/Client.cpp
@@ -26,9 +26,11 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         InitialPrx allTests(const Ice::CommunicatorPtr&);
         InitialPrx initial = allTests(communicator());
diff --git a/cppe/test/IceE/inheritance/Collocated.cpp b/cppe/test/IceE/inheritance/Collocated.cpp
index eb8272e9862..869bd4f8f0c 100644
--- a/cppe/test/IceE/inheritance/Collocated.cpp
+++ b/cppe/test/IceE/inheritance/Collocated.cpp
@@ -26,11 +26,13 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
-        properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new InitialI(adapter);
diff --git a/cppe/test/IceE/inheritance/Server.cpp b/cppe/test/IceE/inheritance/Server.cpp
index a182a98d5bf..bb3e88f363a 100644
--- a/cppe/test/IceE/inheritance/Server.cpp
+++ b/cppe/test/IceE/inheritance/Server.cpp
@@ -25,11 +25,13 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
-        properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+    	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new InitialI(adapter);
diff --git a/cppe/test/IceE/location/Client.cpp b/cppe/test/IceE/location/Client.cpp
index e9b95aeadef..7c0239a0de4 100644
--- a/cppe/test/IceE/location/Client.cpp
+++ b/cppe/test/IceE/location/Client.cpp
@@ -28,21 +28,23 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties(argc, argv);
-        loadConfig(properties);
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties(argc, argv);
+        loadConfig(initData.properties);
 
 	//
 	// For blocking client change retry interval from default.
 	//
-	if(properties->getPropertyAsInt("Ice.Blocking") > 0)
+	if(initData.properties->getPropertyAsInt("Ice.Blocking") > 0)
 	{
-	    properties->setProperty("Ice.RetryIntervals", "0 0");
-	    properties->setProperty("Ice.Warn.Connections", "0");
+	    initData.properties->setProperty("Ice.RetryIntervals", "0 0");
+	    initData.properties->setProperty("Ice.Warn.Connections", "0");
 	}
 
-	properties->setProperty("Ice.Default.Locator",
-				properties->getPropertyWithDefault("Location.Locator", "locator:default -p 12010"));
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	initData.properties->setProperty("Ice.Default.Locator",
+			initData.properties->getPropertyWithDefault("Location.Locator", "locator:default -p 12010"));
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         void allTests(const Ice::CommunicatorPtr&);
 	allTests(communicator());
diff --git a/cppe/test/IceE/location/Server.cpp b/cppe/test/IceE/location/Server.cpp
index 1507d8704d8..586b32225a4 100644
--- a/cppe/test/IceE/location/Server.cpp
+++ b/cppe/test/IceE/location/Server.cpp
@@ -29,33 +29,35 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties(argc, argv);
-        properties->setProperty("ServerManager.Endpoints", "default -p 12010");
+    	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties(argc, argv);
+        initData.properties->setProperty("ServerManager.Endpoints", "default -p 12010");
 
-        loadConfig(properties);
+        loadConfig(initData.properties);
 
 	//
 	// For blocking client test, set timeout so CloseConnection send will
 	// return quickly. Otherwise server will hang since client is not 
 	// listening for these messages.
 	//
-	if(properties->getPropertyAsInt("Ice.Blocking") > 0)
+	if(initData.properties->getPropertyAsInt("Ice.Blocking") > 0)
 	{
-	    properties->setProperty("Ice.Override.Timeout", "100");
-	    properties->setProperty("Ice.Warn.Connections", "0");
+	    initData.properties->setProperty("Ice.Override.Timeout", "100");
+	    initData.properties->setProperty("Ice.Warn.Connections", "0");
 	}
 
 	//
 	// These properties cannot be overridden. The OAs started by
 	// the ServerManager must be local.
 	//
-	properties->setProperty("TestAdapter.Endpoints", "default");
-	properties->setProperty("TestAdapter.AdapterId", "TestAdapter");
-	properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
-	properties->setProperty("TestAdapter2.Endpoints", "default");
-	properties->setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default");
+	initData.properties->setProperty("TestAdapter.AdapterId", "TestAdapter");
+	initData.properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+	initData.properties->setProperty("TestAdapter2.Endpoints", "default");
+	initData.properties->setProperty("TestAdapter2.AdapterId", "TestAdapter2");
 
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         //
         // Register the server manager. The server manager creates a
@@ -72,7 +74,7 @@ public:
         //
         ServerLocatorRegistryPtr registry = new ServerLocatorRegistry();
         registry->addObject(adapter->createProxy(Ice::stringToIdentity("ServerManager")));
-        Ice::ObjectPtr object = new ServerManagerI(adapter, registry, properties);
+        Ice::ObjectPtr object = new ServerManagerI(adapter, registry, initData.properties);
         adapter->add(object, Ice::stringToIdentity("ServerManager"));
 
         Ice::LocatorRegistryPrx registryPrx = 
diff --git a/cppe/test/IceE/location/TestI.cpp b/cppe/test/IceE/location/TestI.cpp
index 51a5d006028..b6da40a70a3 100644
--- a/cppe/test/IceE/location/TestI.cpp
+++ b/cppe/test/IceE/location/TestI.cpp
@@ -45,8 +45,10 @@ ServerManagerI::startServer(const Ice::Current&)
     // its endpoints with the locator and create references containing
     // the adapter id instead of the endpoints.
     //
-    Ice::CommunicatorPtr serverCommunicator = Ice::initializeWithProperties(argc, argv, _properties);
-    serverCommunicator->setLogger(_adapter->getCommunicator()->getLogger());
+    Ice::InitializationData initData;
+    initData.properties = _properties;
+    initData.logger = _adapter->getCommunicator()->getLogger();
+    Ice::CommunicatorPtr serverCommunicator = Ice::initialize(argc, argv, initData);
     _communicators.push_back(serverCommunicator); 
 
     Ice::ObjectAdapterPtr adapter = serverCommunicator->createObjectAdapter("TestAdapter");
diff --git a/cppe/test/IceE/operations/Client.cpp b/cppe/test/IceE/operations/Client.cpp
index 550254df87f..00a4136e677 100644
--- a/cppe/test/IceE/operations/Client.cpp
+++ b/cppe/test/IceE/operations/Client.cpp
@@ -26,23 +26,25 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+    	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 	//
 	// We must set MessageSizeMax to an explicit values, because
 	// we run tests to check whether Ice.MemoryLimitException is
 	// raised as expected.
 	//
-	properties->setProperty("Ice.MessageSizeMax", "100");
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+	initData.properties->setProperty("Ice.MessageSizeMax", "100");
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 
 	//
 	// We don't want connection warnings because of the timeout test.
 	//
-	properties->setProperty("Ice.Warn.Connections", "0");
+	initData.properties->setProperty("Ice.Warn.Connections", "0");
 
         Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
         Test::MyClassPrx myClass = allTests(communicator());
diff --git a/cppe/test/IceE/operations/Collocated.cpp b/cppe/test/IceE/operations/Collocated.cpp
index 7d16d82448e..85376091a7a 100644
--- a/cppe/test/IceE/operations/Collocated.cpp
+++ b/cppe/test/IceE/operations/Collocated.cpp
@@ -26,20 +26,22 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+    	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 
 	//
 	// We must set MessageSizeMax to an explicit values, because
 	// we run tests to check whether Ice.MemoryLimitException is
 	// raised as expected.
 	//
-	properties->setProperty("Ice.MessageSizeMax", "100");
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+	initData.properties->setProperty("Ice.MessageSizeMax", "100");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
 	Ice::Identity id = Ice::stringToIdentity("test");
diff --git a/cppe/test/IceE/operations/Server.cpp b/cppe/test/IceE/operations/Server.cpp
index 673b636e279..83facd40c7a 100644
--- a/cppe/test/IceE/operations/Server.cpp
+++ b/cppe/test/IceE/operations/Server.cpp
@@ -26,14 +26,16 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-	Ice::PropertiesPtr properties = Ice::createProperties();
+        Ice::InitializationData initData;
+	initData.properties = Ice::createProperties();
 
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 	
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
 	Ice::Identity id = Ice::stringToIdentity("test");
diff --git a/cppe/test/IceE/operations/Twoways.cpp b/cppe/test/IceE/operations/Twoways.cpp
index 5bcd0718328..ecf6b5c15ed 100644
--- a/cppe/test/IceE/operations/Twoways.cpp
+++ b/cppe/test/IceE/operations/Twoways.cpp
@@ -645,45 +645,31 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 	    //
 	    // Test that default context is obtained correctly from communicator.
 	    //
-	    Ice::Context dflt;
-	    dflt["a"] = "b";
-	    communicator->setDefaultContext(dflt);
-	    test(p->opContext() != dflt);
+            int argc = 0;
+            char* argv[] = { "" };
+            Ice::InitializationData initData;
+            initData.defaultContext["a"] = "b";
+            Ice::CommunicatorPtr communicator2 = Ice::initialize(argc, argv, initData);
 
-	    Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_context(Ice::Context()));
-	    test(p2->opContext().empty());
-
-	    p2 = Test::MyClassPrx::uncheckedCast(p->ice_defaultContext());
-	    test(p2->opContext() == dflt);
-
-	    communicator->setDefaultContext(Ice::Context());
-	    test(!p2->opContext().empty());
-
-	    communicator->setDefaultContext(dflt);
 	    string ref = communicator->getProperties()->getPropertyWithDefault(
 		"Operations.Proxy", "test:default -p 12010 -t 10000");
 	    Test::MyClassPrx c = Test::MyClassPrx::checkedCast(communicator->stringToProxy(ref));
-	    test(c->opContext() == dflt);
+	    test(c->opContext() == initData.defaultContext);
 
-	    dflt["a"] = "c";
-	    Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt));
+	    Ice::Context ctx;
+	    ctx["a"] = "c";
+	    Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(ctx));
 	    test(c2->opContext()["a"] == "c");
 
-	    dflt.clear();
-	    Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt));
+	    ctx.clear();
+	    Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(ctx));
 	    Ice::Context tmp = c3->opContext();
 	    test(tmp.find("a") == tmp.end());
 
 	    Test::MyClassPrx c4 = Test::MyClassPrx::uncheckedCast(c2->ice_defaultContext());
 	    test(c4->opContext()["a"] == "b");
 
-	    dflt["a"] = "d";
-	    communicator->setDefaultContext(dflt);
-
-	    Test::MyClassPrx c5 = Test::MyClassPrx::uncheckedCast(c->ice_defaultContext());
-	    test(c5->opContext()["a"] == "d");
-
-	    communicator->setDefaultContext(Ice::Context());
+	    communicator2->destroy();
 	}
     }
 
diff --git a/cppe/test/IceE/retry/Client.cpp b/cppe/test/IceE/retry/Client.cpp
index 2f40ceb4ece..21ccc08bae3 100644
--- a/cppe/test/IceE/retry/Client.cpp
+++ b/cppe/test/IceE/retry/Client.cpp
@@ -26,23 +26,25 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
+	loadConfig(initData.properties);
 
 	//
 	// For this test, we want to disable retries.
 	//
-	properties->setProperty("Ice.RetryIntervals", "-1");
+	initData.properties->setProperty("Ice.RetryIntervals", "-1");
 
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 
 	//
 	// This test kills connections, so we don't want warnings.
 	//
-	properties->setProperty("Ice.Warn.Connections", "0");
+	initData.properties->setProperty("Ice.Warn.Connections", "0");
 
         Test::RetryPrx allTests(const Ice::CommunicatorPtr&);
         Test::RetryPrx retry = allTests(communicator());
diff --git a/cppe/test/IceE/retry/Server.cpp b/cppe/test/IceE/retry/Server.cpp
index 660c9293660..f11f6168fe6 100644
--- a/cppe/test/IceE/retry/Server.cpp
+++ b/cppe/test/IceE/retry/Server.cpp
@@ -26,14 +26,16 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
+    	Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
 
-	properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-	//properties->setProperty("Ice.Trace.Network", "5");
-	//properties->setProperty("Ice.Trace.Protocol", "5");
+	initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+	//initData.properties->setProperty("Ice.Trace.Network", "5");
+	//initData.properties->setProperty("Ice.Trace.Protocol", "5");
 
-	loadConfig(properties);
-	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+	loadConfig(initData.properties);
+	initData.logger = getLogger();
+	setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new RetryI;
diff --git a/cppe/test/IceE/slicing/Client.cpp b/cppe/test/IceE/slicing/Client.cpp
index 26703721335..a8762d778aa 100644
--- a/cppe/test/IceE/slicing/Client.cpp
+++ b/cppe/test/IceE/slicing/Client.cpp
@@ -26,9 +26,11 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         TestIntfPrx allTests(const Ice::CommunicatorPtr&);
         TestIntfPrx Test = allTests(communicator());
diff --git a/cppe/test/IceE/slicing/Server.cpp b/cppe/test/IceE/slicing/Server.cpp
index 700d45bfeff..3545ea999ed 100644
--- a/cppe/test/IceE/slicing/Server.cpp
+++ b/cppe/test/IceE/slicing/Server.cpp
@@ -25,12 +25,14 @@ public:
     virtual int
     run(int argc, char* argv[])
     {
-        Ice::PropertiesPtr properties = Ice::createProperties();
-        properties->setProperty("Ice.Warn.Dispatch", "0");
-        properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+        initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000");
 
-        loadConfig(properties);
-        setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+        loadConfig(initData.properties);
+	initData.logger = getLogger();
+        setCommunicator(Ice::initialize(argc, argv, initData));
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new TestI(adapter);
diff --git a/cppe/test/include/TestApplication.h b/cppe/test/include/TestApplication.h
index b7e8f0d0b20..578b8add33f 100644
--- a/cppe/test/include/TestApplication.h
+++ b/cppe/test/include/TestApplication.h
@@ -37,6 +37,8 @@ public:
 
     virtual int run(int, char*[]) = 0;
 
+    Ice::LoggerPtr getLogger();
+
     void setCommunicator(const Ice::CommunicatorPtr&);
     Ice::CommunicatorPtr communicator();