diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
| commit | d07fdae285690f699a70f97f36232e516dcad2bc (patch) | |
| tree | c239def689c5e6cc53ac76dbe3e60ec11c306964 /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | Fixed tryLock() comment (diff) | |
| download | ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2 ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip | |
Object adapter properties now prefixed by "Ice.OA."
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 611966a6672..f99092e1062 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -681,6 +681,10 @@ CommunicatorDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) desc.serverLifetime = attrs.asBool("server-lifetime", true); _descriptor->adapters.push_back(desc); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + addProperty(_hiddenProperties, "Ice.OA." + desc.name + ".Endpoints", attrs("endpoints", "default")); addProperty(_hiddenProperties, desc.name + ".Endpoints", attrs("endpoints", "default")); } @@ -904,8 +908,13 @@ IceBoxDescriptorBuilder::init(const IceBoxDescriptorPtr& desc, const XmlAttribut ServerDescriptorBuilder::init(desc, attrs); _descriptor = desc; + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // addProperty(_hiddenProperties, "IceBox.InstanceName", "${server}"); + addProperty(_hiddenProperties, "Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"); addProperty(_hiddenProperties, "IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"); + addProperty(_hiddenProperties, "Ice.OA.IceBox.ServiceManager.RegisterProcess", "1"); addProperty(_hiddenProperties, "IceBox.ServiceManager.RegisterProcess", "1"); } @@ -932,7 +941,13 @@ IceBoxDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) PropertyDescriptorSeq::iterator p = _hiddenProperties.begin(); while(p != _hiddenProperties.end()) { - if(p->name == "IceBox.ServiceManager.Endpoints" || p->name == "IceBox.ServiceManager.RegisterProcess") + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(p->name == "Ice.OA.IceBox.ServiceManager.Endpoints" || + p->name == "IceBox.ServiceManager.Endpoints" || + p->name == "Ice.OA.IceBox.ServiceManager.RegisterProcess" || + p->name == "IceBox.ServiceManager.RegisterProcess") { p = _hiddenProperties.erase(p); } |