diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-02-14 14:30:41 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-02-14 14:30:41 +0000 |
| commit | fc7f0213bab5d14ae26423c78c0d9d221f93774a (patch) | |
| tree | 7e92a757a34dfd39b3d2ada6185a433c41b3e69f /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | Backed out Ice.OA prefix addition (diff) | |
| download | ice-fc7f0213bab5d14ae26423c78c0d9d221f93774a.tar.bz2 ice-fc7f0213bab5d14ae26423c78c0d9d221f93774a.tar.xz ice-fc7f0213bab5d14ae26423c78c0d9d221f93774a.zip | |
Removed support for removed Ice.OA property prefix
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index eeb0c11c723..f4eeae190cc 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -681,7 +681,7 @@ CommunicatorDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) desc.serverLifetime = attrs.asBool("server-lifetime", true); _descriptor->adapters.push_back(desc); - addProperty(_hiddenProperties, "Ice.OA." + desc.name + ".Endpoints", attrs("endpoints", "default")); + addProperty(_hiddenProperties, desc.name + ".Endpoints", attrs("endpoints", "default")); } void @@ -844,7 +844,6 @@ 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", ""); } ServiceDescriptorBuilder* @@ -920,13 +919,13 @@ IceBoxDescriptorBuilder::finish() } if(_descriptor->adapters.empty()) { - if(getProperty(_descriptor->propertySet.properties, "Ice.OA.IceBox.ServiceManager.Endpoints").empty()) + if(getProperty(_descriptor->propertySet.properties, "IceBox.ServiceManager.Endpoints").empty()) { - _hiddenProperties.push_back(createProperty("Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); + _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); } - if(getProperty(_descriptor->propertySet.properties, "Ice.OA.IceBox.ServiceManager.RegisterProcess").empty()) + if(getProperty(_descriptor->propertySet.properties, "IceBox.ServiceManager.RegisterProcess").empty()) { - _hiddenProperties.push_back(createProperty("Ice.OA.IceBox.ServiceManager.RegisterProcess", "1")); + _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.RegisterProcess", "1")); } } |