diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 25197555409..753e947f85b 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -165,7 +165,9 @@ AdminI::getDefaultApplicationDescriptor(const Current& current) const string path = properties->getProperty("IceGrid.Registry.DefaultTemplates"); if(path.empty()) { - return ApplicationDescriptor(); + throw IceXML::ParserException(__FILE__, __LINE__, + "no default templates configured, you need to set " + "IceGrid.Registry.DefaultTemplates in the registry configuration."); } try { @@ -174,23 +176,23 @@ AdminI::getDefaultApplicationDescriptor(const Current& current) const if(!desc.nodes.empty()) { throw IceXML::ParserException(__FILE__, __LINE__, - "invalid default application descriptor:\nnode definitions are not allowed"); + "invalid default application descriptor:\nnode definitions are not allowed."); } if(!desc.distrib.icepatch.empty() || !desc.distrib.directories.empty()) { throw IceXML::ParserException(__FILE__, __LINE__, - "invalid default application descriptor:\ndistribution is not allowed"); + "invalid default application descriptor:\ndistribution is not allowed."); } if(!desc.replicaGroups.empty()) { throw IceXML::ParserException(__FILE__, __LINE__, "invalid default application descriptor:\n" - "replica group definitions are not allowed"); + "replica group definitions are not allowed."); } if(!desc.description.empty()) { throw IceXML::ParserException(__FILE__, __LINE__, - "invalid default application descriptor:\ndescription is not allowed"); + "invalid default application descriptor:\ndescription is not allowed."); } if(!desc.variables.empty()) { diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index e7c8a1f810b..0c216f1f243 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -259,7 +259,7 @@ ApplicationDescriptorBuilder::addServiceTemplate(const string& id, const Templat void ApplicationDescriptorBuilder::addDistribution(const XmlAttributesHelper& attrs) { - _descriptor.distrib.icepatch = attrs("icepatch", ""); + _descriptor.distrib.icepatch = attrs("icepatch", "${application}.IcePatch2/server"); } void @@ -526,8 +526,8 @@ ServerDescriptorBuilder::init(const ServerDescriptorPtr& desc, const XmlAttribut _descriptor = desc; _descriptor->id = attrs("id"); _descriptor->exe = attrs("exe"); - _descriptor->activationTimeout = attrs("activation-timeout", "0"); - _descriptor->deactivationTimeout = attrs("deactivation-timeout", "0"); + _descriptor->activationTimeout = attrs("activation-timeout", ""); + _descriptor->deactivationTimeout = attrs("deactivation-timeout", ""); _descriptor->pwd = attrs("pwd", ""); _descriptor->activation = attrs("activation", "manual"); } @@ -565,7 +565,7 @@ ServerDescriptorBuilder::addServiceInstance(const XmlAttributesHelper& desc) void ServerDescriptorBuilder::addDistribution(const XmlAttributesHelper& attrs) { - _descriptor->distrib.icepatch = attrs("icepatch", "${application}.IcePatch2"); + _descriptor->distrib.icepatch = attrs("icepatch", "${application}.IcePatch2/server"); } void |