6 files changed, 22 insertions, 12 deletions
diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp
index 3da2300fb15..42c431d0a93 100644
--- a/cpp/test/Ice/location/ServerLocator.cpp
+++ b/cpp/test/Ice/location/ServerLocator.cpp
@@ -19,8 +19,8 @@ ServerLocatorRegistry::ServerLocatorRegistry()
 
 void 
 ServerLocatorRegistry::setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb,
-						   const ::std::string& adapter, const ::Ice::ObjectPrx& object, 
-						   const ::Ice::Current&)
+						   const std::string&, const ::std::string& adapter, 
+						   const ::Ice::ObjectPrx& object, const ::Ice::Current&)
 {
     _adapters[adapter] = object;
     cb->ice_response();
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h
index d155e4c0067..988ebc117d2 100644
--- a/cpp/test/Ice/location/ServerLocator.h
+++ b/cpp/test/Ice/location/ServerLocator.h
@@ -20,7 +20,8 @@ public:
     ServerLocatorRegistry();
     
     virtual void setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&,
-					     const ::std::string&, const ::Ice::ObjectPrx&, const ::Ice::Current&);
+					     const std::string&, const ::std::string&, const ::Ice::ObjectPrx&, 
+					     const ::Ice::Current&);
     virtual void setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&,
 					     const ::std::string&, const ::Ice::ProcessPrx&, const ::Ice::Current&);
 
diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp
index 6a53a763a8c..389330d1455 100644
--- a/cpp/test/IceGrid/deployer/AllTests.cpp
+++ b/cpp/test/IceGrid/deployer/AllTests.cpp
@@ -364,7 +364,15 @@ allTests(const Ice::CommunicatorPtr& communicator, bool withTemplates)
 	update.servers.push_back(icebox2);
     }
 
-    admin->updateApplication(update);
+    try
+    {
+	admin->updateApplication(update);
+    }
+    catch(const DeploymentException& ex)
+    {
+	cerr << ex << ":\n" << ex.reason << endl;
+	test(false);
+    }
 
     test(admin->startServer("Server1")); // Ensure Server1 is back.
     try
diff --git a/cpp/test/IceGrid/deployer/application.xml b/cpp/test/IceGrid/deployer/application.xml
index 8353d994da0..1c49d7d6344 100644
--- a/cpp/test/IceGrid/deployer/application.xml
+++ b/cpp/test/IceGrid/deployer/application.xml
@@ -2,6 +2,8 @@
 
   <application name="test">
 
+    <replicated-adapter id="ReplicatedAdapter"/>
+
     <node name="localnode">
 
       <include name="IceBox1" descriptor="icebox.xml"/>
@@ -13,4 +15,4 @@
 
   </application>
 
-</icegrid>
-\ No newline at end of file
+</icegrid>
diff --git a/cpp/test/IceGrid/deployer/service.xml b/cpp/test/IceGrid/deployer/service.xml
index addbc956482..9ccb36f8e79 100644
--- a/cpp/test/IceGrid/deployer/service.xml
+++ b/cpp/test/IceGrid/deployer/service.xml
@@ -6,6 +6,7 @@
       <adapter name="${name}" endpoints="default">
         <object identity="${server}-${name}" type="::Test"/>
       </adapter>
+      <adapter name="${name}.Replicated" endpoints="default" id="ReplicatedAdapter"/>
     </adapters>
 
     <properties>
@@ -23,4 +24,4 @@
 
   </service>
 
-</icegrid>
-\ No newline at end of file
+</icegrid>
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index e1c7b8030a3..0c561ca2373 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -48,9 +48,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	adapter.id = "ServerAdapter";
 	adapter.registerProcess = true;
 	ObjectDescriptor object;
-	object.proxy = communicator->stringToProxy("test@ServerAdapter");
+	object.id = Ice::stringToIdentity("test");
 	object.type = "::Test::TestIntf";
-	object.adapterId = "ServerAdapter";
 	adapter.objects.push_back(object);
 	instance.descriptor->adapters.push_back(adapter);
 	update.servers.push_back(instance);
@@ -88,7 +87,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	    test(false);
 	}
 
-	update.servers[0].descriptor->adapters[0].objects[0].proxy = communicator->stringToProxy("test2@ServerAdapter");
+	update.servers[0].descriptor->adapters[0].objects[0].id = Ice::stringToIdentity("test2");
 	try
 	{
 	    admin->updateApplication(update);
@@ -111,9 +110,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	adapter.id = "${server}";
 	adapter.registerProcess = true;
 	object = ObjectDescriptor();
-	object.proxy = communicator->stringToProxy("${server}@" + adapter.id);
+	object.id = Ice::stringToIdentity("${server}");
 	object.type = "::Test::TestIntf";
-	object.adapterId = adapter.id;
 	adapter.objects.push_back(object);
 	server->adapters.push_back(adapter);
 	update = empty;
@@ -322,7 +320,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	adapter = AdapterDescriptor();
 	adapter.id = "ServerX";
 	object = ObjectDescriptor();
-	object.proxy = communicator->stringToProxy("test");
+	object.id = Ice::stringToIdentity("test");
 	adapter.objects.push_back(object);
 	instance.descriptor->adapters.push_back(adapter);
 	update = empty;