diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-04-28 11:16:08 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-04-28 11:16:08 +0800 |
| commit | b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce (patch) | |
| tree | 2b7620aa78f750ce178e39d1b8a99c3e5f6e01db /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | removed bogus rule. (diff) | |
| parent | minor edits to README for secure IceGrid demo (diff) | |
| download | ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.bz2 ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.xz ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.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 | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index c27b233fa94..67438840742 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -841,16 +841,6 @@ ServerDescriptorBuilder::init(const ServerDescriptorPtr& desc, const XmlAttribut _descriptor->iceVersion = attrs("ice-version", ""); } -void -ServerDescriptorBuilder::finish() -{ - if(!isSet(_descriptor->propertySet.properties, "Ice.Admin.Endpoints")) - { - _hiddenProperties.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); - } - CommunicatorDescriptorBuilder::finish(); -} - ServiceDescriptorBuilder* ServerDescriptorBuilder::createService(const XmlAttributesHelper& attrs) { @@ -915,21 +905,6 @@ IceBoxDescriptorBuilder::init(const IceBoxDescriptorPtr& desc, const XmlAttribut _descriptor = desc; } -void -IceBoxDescriptorBuilder::finish() -{ - if(!isSet(_descriptor->propertySet.properties, "IceBox.InstanceName")) - { - _hiddenProperties.push_back(createProperty("IceBox.InstanceName", "${server}")); - } - - // - // The NodeCache takes care of setting Endpoints and RegisterProcess for old IceBox servers - // - - ServerDescriptorBuilder::finish(); -} - ServiceDescriptorBuilder* IceBoxDescriptorBuilder::createService(const XmlAttributesHelper& attrs) { |