5 files changed, 8 insertions, 11 deletions
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index b02aa8960d7..3e5becb0693 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -70,7 +70,7 @@ PhoneBookCollocated::run(int argc, char* argv[])
 	// Create an Object Adapter, use the Evictor as Servant Locator.
 	//
 	ObjectAdapterPtr adapter = communicator()->createObjectAdapter("PhoneBookAdapter");
-	adapter->setServantLocator(evictor);
+	adapter->addServantLocator(evictor, "contact");
 	
 	//
 	// Create the phonebook, and add it to the Object Adapter.
@@ -83,7 +83,7 @@ PhoneBookCollocated::run(int argc, char* argv[])
 	//
 	ServantFactoryPtr contactFactory = new ContactFactory(phoneBook, evictor);
 	ServantInitializerPtr contactInitializer = ServantInitializerPtr::dynamicCast(contactFactory);
-	communicator()->installServantFactory(contactFactory, "::Contact");
+	communicator()->addServantFactory(contactFactory, "::Contact");
 	evictor->installServantInitializer(contactInitializer);
 	
 	//
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index 69d02daab1b..3a1c70895a4 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -269,8 +269,5 @@ PhoneBookI::getNewIdentity()
     ids.push_back(s);
     _nameIdentitiesDict->put("ID", ids);
 
-    return string("phonebook.contact#") + s;
+    return string("contact#") + s;
 }
-
-
-
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index 48732884f89..ea4c8376d2a 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -71,7 +71,7 @@ PhoneBookServer::run(int argc, char* argv[])
 	// Create an Object Adapter, use the Evictor as Servant Locator.
 	//
 	ObjectAdapterPtr adapter = communicator()->createObjectAdapter("PhoneBookAdapter");
-	adapter->setServantLocator(evictor);
+	adapter->addServantLocator(evictor, "contact");
 	
 	//
 	// Create the phonebook, and add it to the Object Adapter.
@@ -84,7 +84,7 @@ PhoneBookServer::run(int argc, char* argv[])
 	//
 	ServantFactoryPtr contactFactory = new ContactFactory(phoneBook, evictor);
 	ServantInitializerPtr contactInitializer = ServantInitializerPtr::dynamicCast(contactFactory);
-	communicator()->installServantFactory(contactFactory, "::Contact");
+	communicator()->addServantFactory(contactFactory, "::Contact");
 	evictor->installServantInitializer(contactInitializer);
 	
 	//
diff --git a/cpp/demo/Ice/pickle/Reader.cpp b/cpp/demo/Ice/pickle/Reader.cpp
index 238c53bb998..26e5e562bc9 100644
--- a/cpp/demo/Ice/pickle/Reader.cpp
+++ b/cpp/demo/Ice/pickle/Reader.cpp
@@ -19,7 +19,7 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::ServantFactoryPtr factory = new ServantFactory;
-    communicator->installServantFactory(factory, "::Persistent");
+    communicator->addServantFactory(factory, "::Persistent");
     
     ifstream in("persistent");
     if (!in)
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 246fcceb8bf..40946464496 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -70,7 +70,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     cin.getline(&c, 1);
 
     Ice::ServantFactoryPtr factory = new ServantFactory;
-    communicator->installServantFactory(factory, "::Printer");
+    communicator->addServantFactory(factory, "::Printer");
 
     initial->printer(printer, printerProxy);
     cout << "==> " << printer->_message << endl;
@@ -119,7 +119,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	 << "[press enter]\n";
     cin.getline(&c, 1);
 
-    communicator->installServantFactory(factory, "::DerivedPrinter");
+    communicator->addServantFactory(factory, "::DerivedPrinter");
 
     derivedAsBase = initial->derivedPrinter();
     DerivedPrinterPtr derived = DerivedPrinterPtr::dynamicCast(derivedAsBase);