diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-04 15:49:11 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-04 15:49:11 +0000 |
| commit | f3b88e3177de83300b4b096e9710fd3f86d74a66 (patch) | |
| tree | fcad236aeb0b95ed2e1825a1751d2663a9ccf968 /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | - Modified VC 6 build command so the packaging scripts won't attempt to (diff) | |
| download | ice-f3b88e3177de83300b4b096e9710fd3f86d74a66.tar.bz2 ice-f3b88e3177de83300b4b096e9710fd3f86d74a66.tar.xz ice-f3b88e3177de83300b4b096e9710fd3f86d74a66.zip | |
Distribution improvments, bug fixes, code cleanup.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 4daa5bca804..aea6f22ad98 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -68,7 +68,7 @@ private: bool _isTopLevel; bool _inAdapter; bool _inDbEnv; - bool _inDistribution; + bool _inDistrib; }; } @@ -334,12 +334,11 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at _currentCommunicator->addObject(attributes); } } - else if(name == "distribution") + else if(name == "distrib") { if(!_currentApplication.get() && (!_currentServer.get() || _currentServer.get() != _currentCommunicator)) { - error("the <distribution> element can only be a child of an <application>, <server> or <icebox> " - "element"); + error("the <distrib> element can only be a child of an <application>, <server> or <icebox> element"); } if(!_currentServer.get()) { @@ -349,7 +348,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at { _currentServer->addDistribution(attributes); } - _inDistribution = true; + _inDistrib = true; } else if(name == "dbenv") { @@ -478,9 +477,9 @@ DescriptorHandler::endElement(const string& name, int line, int column) } else if(name == "directory") { - if(!_inDistribution) + if(!_inDistrib) { - error("the <directory> element can only be a child of a <distribution> element"); + error("the <directory> element can only be a child of a <distrib> element"); } if(!_currentServer.get()) { @@ -503,9 +502,9 @@ DescriptorHandler::endElement(const string& name, int line, int column) { _inDbEnv = false; } - else if(name == "distribution") + else if(name == "distrib") { - _inDistribution = false; + _inDistrib = false; } } |