diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 7 | ||||
| -rw-r--r-- | cpp/test/IceGrid/replicaGroup/application.xml | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index d105b3c3090..e030ada78f1 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -956,12 +956,7 @@ IceBoxDescriptorBuilder::createServiceInstance(const XmlAttributesHelper& attrs) void IceBoxDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) { - if(attrs("name") != "IceBox.ServiceManager") - { - throw "<adapter> element can't be a child of an <icebox> element"; - } - - ServerDescriptorBuilder::addAdapter(attrs); + throw "<adapter> element can't be a child of an <icebox> element"; } void diff --git a/cpp/test/IceGrid/replicaGroup/application.xml b/cpp/test/IceGrid/replicaGroup/application.xml index ab33d88b2f1..1c7883d0601 100644 --- a/cpp/test/IceGrid/replicaGroup/application.xml +++ b/cpp/test/IceGrid/replicaGroup/application.xml @@ -52,7 +52,7 @@ <parameter name="priority"/> <service name="${name}" entry="TestService:create"> <adapter name="${service}" endpoints="default" - replica-group="${replicaGroup}" priority="${priority}" server-lifetime="false"> + replica-group="${replicaGroup}" priority="${priority}" server-lifetime="false"> <object identity="${service}"/> </adapter> <property name="Identity" value="${replicaGroup}"/> @@ -66,6 +66,14 @@ <service-instance template="Service" name="Service1" replicaGroup="${replicaGroup}" priority="3"/> <service-instance template="Service" name="Service2" replicaGroup="${replicaGroup}" priority="2"/> <service-instance template="Service" name="Service3" replicaGroup="${replicaGroup}" priority="1"/> + + <!-- Dummy service with server lifetime adapter to ensure all + the services are started when the server is marked as + Active --> + <service name="Dummy" entry="TestService:create"> + <adapter name="${service}" endpoints="default" server-lifetime="true"/> + <property name="Identity" value="dummy"/> + </service> </icebox> </server-template> |