diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
| commit | f185946cfbced2bf5e6bf8deb0993a18057664d5 (patch) | |
| tree | 8a2de32151d5dc71bd0353feefa21de018e85f2f /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | fix for compilation errors with Python 2.5 (diff) | |
| download | ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.bz2 ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.xz ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.zip | |
Squashed commit of the following:
commit 2eba3087584d54d3ba98ef50724710fd34d84e0b
Author: Bernard Normier <bernard@zeroc.com>
Date: Thu Sep 20 15:53:49 2007 -0400
New ice-version attribute, IceGrid now generates Ice.Admin.* properties
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(); } |