diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-01-10 09:24:12 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-01-10 09:24:12 +0000 |
| commit | c4bf4bc99155df8414f63daa138879d8ccacb0f2 (patch) | |
| tree | 6d48fd077ff8d56095bd11db2d9c2157ce93a0ac /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | file OpenSSLRuntime.ism was initially added on branch R3_0_branch. (diff) | |
| download | ice-c4bf4bc99155df8414f63daa138879d8ccacb0f2.tar.bz2 ice-c4bf4bc99155df8414f63daa138879d8ccacb0f2.tar.xz ice-c4bf4bc99155df8414f63daa138879d8ccacb0f2.zip | |
Added "always" activation mode.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 18 |
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"; |