1 files changed, 18 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 2f21765d3a6..fb0345df84e 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -132,12 +132,11 @@ ApplicationDescriptorBuilder::setDescription(const string& desc)
 }
 
 void
-ApplicationDescriptorBuilder::addReplicatedAdapter(const XmlAttributesHelper& attrs)
+ApplicationDescriptorBuilder::addReplicaGroup(const XmlAttributesHelper& attrs)
 {
-    ReplicatedAdapterDescriptor adapter;
+    ReplicaGroupDescriptor adapter;
     adapter.id = attrs("id");
-    adapter.loadBalancing = new RandomLoadBalancingPolicy(); // Default load balancing
-    _descriptor.replicatedAdapters.push_back(adapter);
+    _descriptor.replicaGroups.push_back(adapter);
 }
 
 void
@@ -164,7 +163,7 @@ ApplicationDescriptorBuilder::setLoadBalancing(const XmlAttributesHelper& attrs)
 	throw "invalid load balancing policy `" + type + "'";
     }
     policy->nReplicas = attrs("n-replicas", "0");
-    _descriptor.replicatedAdapters.back().loadBalancing = policy;
+    _descriptor.replicaGroups.back().loadBalancing = policy;
 }
 
 void
@@ -173,7 +172,7 @@ ApplicationDescriptorBuilder::addObject(const XmlAttributesHelper& attrs)
     ObjectDescriptor object;
     object.type = attrs("type", "");
     object.id = Ice::stringToIdentity(attrs("identity"));
-    _descriptor.replicatedAdapters.back().objects.push_back(object);
+    _descriptor.replicaGroups.back().objects.push_back(object);
 }
 
 void
@@ -411,7 +410,7 @@ CommunicatorDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs)
 	}
 	desc.id = fqn + "." + desc.name;
     }
-    desc.replicaId = attrs("replica-id", "");
+    desc.replicaGroupId = attrs("replica-group", "");
     desc.registerProcess = attrs("register-process", "false") == "true";
     if(desc.id == "" && attrs.contains("wait-for-activation"))
     {
@@ -433,6 +432,12 @@ CommunicatorDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs)
 }
 
 void
+CommunicatorDescriptorBuilder::setAdapterDescription(const string& value)
+{
+    _descriptor->adapters.back().description = value;
+}
+
+void
 CommunicatorDescriptorBuilder::addObject(const XmlAttributesHelper& attrs)
 {
     ObjectDescriptor object;
@@ -487,6 +492,12 @@ CommunicatorDescriptorBuilder::addDbEnvProperty(const XmlAttributesHelper& attrs
     _descriptor->dbEnvs.back().properties.push_back(prop);
 }
 
+void
+CommunicatorDescriptorBuilder::setDbEnvDescription(const string& value)
+{
+    _descriptor->dbEnvs.back().description = value;
+}
+
 ServerDescriptorBuilder::ServerDescriptorBuilder(const XmlAttributesHelper& attrs)
 {
     init(new ServerDescriptor(), attrs);