diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-09-20 13:31:17 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-09-20 13:31:17 -0700 |
| commit | 88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc (patch) | |
| tree | 4c11a58a1140221011e78167aff165ef16cab553 /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | minor cleanup in IcePy (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.tar.bz2 ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.tar.xz ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index f4eeae190cc..d105b3c3090 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -844,6 +844,17 @@ ServerDescriptorBuilder::init(const ServerDescriptorPtr& desc, const XmlAttribut _descriptor->applicationDistrib = attrs.asBool("application-distrib", true); _descriptor->allocatable = attrs.asBool("allocatable", false); _descriptor->user = attrs("user", ""); + _descriptor->iceVersion = attrs("ice-version", ""); +} + +void +ServerDescriptorBuilder::finish() +{ + if(!isSet(_descriptor->propertySet.properties, "Ice.Admin.Enpoints")) + { + _hiddenProperties.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); + } + CommunicatorDescriptorBuilder::finish(); } ServiceDescriptorBuilder* @@ -913,22 +924,20 @@ IceBoxDescriptorBuilder::init(const IceBoxDescriptorPtr& desc, const XmlAttribut void IceBoxDescriptorBuilder::finish() { - if(getProperty(_descriptor->propertySet.properties, "IceBox.InstanceName").empty()) + if(!isSet(_descriptor->propertySet.properties, "IceBox.InstanceName")) { _hiddenProperties.push_back(createProperty("IceBox.InstanceName", "${server}")); } - if(_descriptor->adapters.empty()) + + if(!isSet(_descriptor->propertySet.properties, "IceBox.ServiceManager.Endpoints")) { - if(getProperty(_descriptor->propertySet.properties, "IceBox.ServiceManager.Endpoints").empty()) - { - _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); - } - if(getProperty(_descriptor->propertySet.properties, "IceBox.ServiceManager.RegisterProcess").empty()) - { - _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.RegisterProcess", "1")); - } + _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); } - + + // + // The NodeCache takes care of setting RegisterProcess for old IceBox servers + // + ServerDescriptorBuilder::finish(); } |