diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-06 15:15:02 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-06 15:15:02 +0000 |
| commit | 0520bfc67149d75fbf2dffbeac27c43164f16e14 (patch) | |
| tree | 962c18a611b2c530984ab89dc882061e0a335c20 /cpp/src/IceGrid/Parser.cpp | |
| parent | IceGrid.ObjectNotExist -> IceGrid.ObjectNotregistered (diff) | |
| download | ice-0520bfc67149d75fbf2dffbeac27c43164f16e14.tar.bz2 ice-0520bfc67149d75fbf2dffbeac27c43164f16e14.tar.xz ice-0520bfc67149d75fbf2dffbeac27c43164f16e14.zip | |
Added support for default templates.
Added support for default parameters.
Added support for findObjectByTypeOnLeastLoadedNode
Added default templates descriptor (config/templates.xml)
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 0d354e8ab97..a6244cd3018 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -163,7 +163,7 @@ Parser::addApplication(const list<string>& args) } } - _admin->addApplication(DescriptorParser::parseDescriptor(descriptor, targets, vars, _communicator)); + _admin->addApplication(DescriptorParser::parseDescriptor(descriptor, targets, vars, _communicator, _admin)); } catch(const Ice::Exception& ex) { @@ -235,7 +235,7 @@ Parser::diffApplication(const list<string>& args) map<string, string> vars; list<string>::const_iterator p = args.begin(); - string descriptor = *p++; + string desc = *p++; for(; p != args.end(); ++p) { @@ -250,7 +250,7 @@ Parser::diffApplication(const list<string>& args) } } - ApplicationDescriptor newApp = DescriptorParser::parseDescriptor(descriptor, targets, vars, _communicator); + ApplicationDescriptor newApp = DescriptorParser::parseDescriptor(desc, targets, vars, _communicator, _admin); ApplicationDescriptor origApp = _admin->getApplicationDescriptor(newApp.name); ApplicationHelper newAppHelper(newApp); @@ -281,7 +281,7 @@ Parser::updateApplication(const list<string>& args) map<string, string> vars; list<string>::const_iterator p = args.begin(); - string descriptor = *p++; + string desc = *p++; for(; p != args.end(); ++p) { @@ -296,7 +296,7 @@ Parser::updateApplication(const list<string>& args) } } - _admin->syncApplication(DescriptorParser::parseDescriptor(descriptor, targets, vars, _communicator)); + _admin->syncApplication(DescriptorParser::parseDescriptor(desc, targets, vars, _communicator, _admin)); } catch(const Ice::Exception& ex) { @@ -383,11 +383,8 @@ Parser::describeServerTemplate(const list<string>& args) { out << "server template '" << templ << "'"; out << sb; - if(!q->second.parameters.empty()) - { - out << nl << "parameters = '" << toString(q->second.parameters) << "'"; - } - out << nl; + + out << nl << "parameters = '" << toString(q->second.parameters) << "'"; ServerDescriptorPtr server = ServerDescriptorPtr::dynamicCast(q->second.descriptor); IceBoxDescriptorPtr iceBox = IceBoxDescriptorPtr::dynamicCast(server); if(iceBox) |