Removed support for removed Ice.OA property prefix

1 files changed, 5 insertions, 32 deletions

diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index a431b527712..fde6cf359ad 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -60,17 +60,17 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
             _desc->adapters.push_back(new InternalAdapterDescriptor(q->id, q->serverLifetime));
 
             props.push_back(createProperty("# Object adapter " + q->name));
-            PropertyDescriptor prop = removeProperty(communicatorProps, "Ice.OA." + q->name + ".Endpoints");
-            prop.name = "Ice.OA." + q->name + ".Endpoints";
+            PropertyDescriptor prop = removeProperty(communicatorProps, q->name + ".Endpoints");
+            prop.name = q->name + ".Endpoints";
             props.push_back(prop);
-            props.push_back(createProperty("Ice.OA." + q->name + ".AdapterId", q->id));
+            props.push_back(createProperty(q->name + ".AdapterId", q->id));
             if(!q->replicaGroupId.empty())
             {
-                props.push_back(createProperty("Ice.OA." + q->name + ".ReplicaGroupId", q->replicaGroupId));
+                props.push_back(createProperty(q->name + ".ReplicaGroupId", q->replicaGroupId));
             }
             if(q->registerProcess)
             {
-                props.push_back(createProperty("Ice.OA." + q->name + ".RegisterProcess", "1"));
+                props.push_back(createProperty(q->name + ".RegisterProcess", "1"));
                 _desc->processRegistered = true;
             }
         }
@@ -838,14 +838,6 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
     server->activation = info.descriptor->activation;
     server->activationTimeout = info.descriptor->activationTimeout;
     server->deactivationTimeout = info.descriptor->deactivationTimeout;
-    if(!info.descriptor->iceVersion.empty())
-    {
-        server->iceVersion = info.descriptor->iceVersion;
-    }
-    else
-    {
-        server->iceVersion = string(ICE_STRING_VERSION);
-    }
     server->applicationDistrib = info.descriptor->applicationDistrib;
     if(!info.descriptor->distrib.icepatch.empty())
     {
@@ -893,24 +885,5 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
     //
     forEachCommunicator(ToInternalServerDescriptor(server, _session->getInfo()))(info.descriptor);
 
-    //
-    // Transform the OA properties to the old naming (Ice.OA.XXX.* ->
-    // XXX.*) for server with a version < 3.2.0
-    // 
-    if(getMMVersion(server->iceVersion) < 30200)
-    {
-        const string oaPrefix = "Ice.OA.";
-        for(PropertyDescriptorSeqDict::iterator p = server->properties.begin(); p != server->properties.end(); ++p)
-        {
-            for(PropertyDescriptorSeq::iterator q = p->second.begin(); q != p->second.end(); ++q)
-            {
-                if(q->name.find(oaPrefix) == 0)
-                {
-                    q->name = q->name.substr(oaPrefix.size());
-                }
-            }
-        }
-    }
-
     return server;
 }