1 files changed, 16 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index a85d3fbe3ec..f4c6393c583 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -526,6 +526,7 @@ Resolver::getVariable(const string& name, bool checkParams, bool& param) const
     }    
 
     throw "undefined variable `" + name + "'";
+    return ""; // To keep the compiler happy.
 }
 
 map<string, string>
@@ -938,7 +939,8 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance, const Resolve
     instance->pwd = resolve(_desc->pwd, "working directory path");
     instance->activation = resolve(_desc->activation, "activation");
     instance->applicationDistrib = _desc->applicationDistrib;
-    if(!instance->activation.empty() && instance->activation != "manual" && instance->activation != "on-demand")
+    if(!instance->activation.empty() && 
+       instance->activation != "manual" && instance->activation != "on-demand" && instance->activation != "always")
     {
 	resolve.exception("unknown activation `" + instance->activation + "'");
     }
@@ -975,6 +977,12 @@ ServerHelper::instantiate(const Resolver& resolver) const
 }
 
 void
+ServerHelper::print(Output& out) const
+{
+    print(out, "", "");
+}
+
+void
 ServerHelper::print(Output& out, const string& application, const string& node) const
 {
     out << "server `" + _desc->id + "'";
@@ -1099,6 +1107,12 @@ IceBoxHelper::instantiateImpl(const IceBoxDescriptorPtr& instance, const Resolve
 }
 
 void
+IceBoxHelper::print(Output& out) const
+{
+    print(out, "", "");
+}
+
+void
 IceBoxHelper::print(Output& out, const string& application, const string& node) const
 {
     out << "icebox `" + _desc->id + "'";
@@ -1252,7 +1266,7 @@ ServiceInstanceHelper::print(Output& out) const
     else
     {
 	assert(!_template.empty());
-	out << nl << "service instance";
+	out << "service instance";
 	out << sb;
 	out << nl << "template = `" << _template << "'";
 	out << nl << "parameters";