Removed use of Ice.OA.

8 files changed, 92 insertions, 151 deletions

diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index c949bef73fe..9855723bd18 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -131,11 +131,8 @@ Glacier2::RouterService::start(int argc, char* argv[])
     //
     // Initialize the client object adapter.
     //
-    // DEPRECATED PROPERTY: Remove extra code in future release
-    //
-    const string clientEndpointsProperty = "Ice.OA.Glacier2.Client.Endpoints";
-    if(properties->getProperty(clientEndpointsProperty).empty() && 
-       properties->getProperty("Glacier2.Client.Endpoints").empty())
+    const string clientEndpointsProperty = "Glacier2.Client.Endpoints";
+    if(properties->getProperty(clientEndpointsProperty).empty())
     {
         error("property `" + clientEndpointsProperty + "' is not set");
         return false;
@@ -146,12 +143,9 @@ Glacier2::RouterService::start(int argc, char* argv[])
     // Initialize the server object adapter only if server endpoints
     // are defined.
     //
-    // DEPRECATED PROPERTY: Remove extra code in future release
-    //
-    const string serverEndpointsProperty = "Ice.OA.Glacier2.Server.Endpoints";
+    const string serverEndpointsProperty = "Glacier2.Server.Endpoints";
     ObjectAdapterPtr serverAdapter;
-    if(!properties->getProperty(serverEndpointsProperty).empty() ||
-       !properties->getProperty("Glacier2.Server.Endpoints").empty())
+    if(!properties->getProperty(serverEndpointsProperty).empty())
     {
         serverAdapter = communicator()->createObjectAdapter("Glacier2.Server");
     }
@@ -160,12 +154,9 @@ Glacier2::RouterService::start(int argc, char* argv[])
     // Initialize the admin object adapter only if admin endpoints
     // are defined.
     //
-    // DEPRECATED PROPERTY: Remove extra code in future release
-    //
-    const string adminEndpointsProperty = "Ice.OA.Glacier2.Admin.Endpoints";
+    const string adminEndpointsProperty = "Glacier2.Admin.Endpoints";
     ObjectAdapterPtr adminAdapter;
-    if(!properties->getProperty(adminEndpointsProperty).empty() ||
-       !properties->getProperty("Glacier2.Admin.Endpoints").empty())
+    if(!properties->getProperty(adminEndpointsProperty).empty())
     {
         adminAdapter = communicator()->createObjectAdapter("Glacier2.Admin");
     }
@@ -176,7 +167,7 @@ Glacier2::RouterService::start(int argc, char* argv[])
     // We need a separate object adapter for any collocated
     // permissions verifiers. We can't use the client adapter.
     //
-    properties->setProperty("Ice.OA.Glacier2Internal.Verifiers.AdapterId", IceUtil::generateUUID());
+    properties->setProperty("Glacier2Internal.Verifiers.AdapterId", IceUtil::generateUUID());
     ObjectAdapterPtr verifierAdapter = communicator()->createObjectAdapter("Glacier2Internal.Verifiers");
 
     //
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index d12170920bc..3f69ac6c40f 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -45,8 +45,6 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-string Ice::ObjectAdapterI::_propertyPrefix = "Ice.OA.";
-
 string
 Ice::ObjectAdapterI::getName() const
 {
@@ -103,11 +101,7 @@ Ice::ObjectAdapterI::activate()
         {
             PropertiesPtr properties = _instance->initializationData().properties;
             printAdapterReady = properties->getPropertyAsInt("Ice.PrintAdapterReady") > 0;
-            //
-            // DEPREACTED PROPERTY: Remove extra code in future release
-            //
-            registerProcess = properties->getPropertyAsIntWithDefault(_propertyPrefix + _name + ".RegisterProcess",
-                properties->getPropertyAsInt(_name + ".RegisterProcess")) > 0;
+            registerProcess = properties->getPropertyAsInt(_name + ".RegisterProcess") > 0;
         }
     }
 
@@ -757,57 +751,27 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
     }
 
     //
-    // DEPRECATED PROPERTIES: Remove extra code in future release
-    //
-
-    //
     // Make sure named adapter has some configuration
     //
     PropertiesPtr properties = instance->initializationData().properties;
     StringSeq oldProps = filterProperties(_name + ".");
     if(endpointInfo.empty() && router == 0)
     {
-        StringSeq props = filterProperties(_propertyPrefix + _name + ".");
-        if(oldProps.size() == 0 && props.size() == 0)
-        {
-            InitializationException ex(__FILE__, __LINE__);
-            ex.reason = "object adapter \"" + _name + "\" requires configuration.";
-            throw ex;
-        }
-    }
-
-    if(oldProps.size() != 0)
-    {
-        Warning out(_instance->initializationData().logger);
-        out << "The following properties have been deprecated, please prepend \"Ice.OA.\":";
-        for(unsigned int i = 0; i < oldProps.size(); ++i)
-        {
-            out << "\n    " << oldProps[i];
-        }
+        InitializationException ex(__FILE__, __LINE__);
+        ex.reason = "object adapter \"" + _name + "\" requires configuration.";
+        throw ex;
     }
 
-    const_cast<string&>(_id) = properties->getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId",
-        properties->getProperty(_name + ".AdapterId"));
-    const_cast<string&>(_replicaGroupId) = 
-        properties->getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId",
-        properties->getProperty(_name + ".ReplicaGroupId"));
+    const_cast<string&>(_id) = properties->getProperty(_name + ".AdapterId");
+    const_cast<string&>(_replicaGroupId) = properties->getProperty(_name + ".ReplicaGroupId");
 
     __setNoDelete(true);
     try
     {
-        _threadPerConnection = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPerConnection") > 0;
-
-        int threadPoolSize = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size");
-        if(threadPoolSize == 0)
-        {
-            threadPoolSize = properties->getPropertyAsInt(_name + ".ThreadPool.Size");
-        }
-        int threadPoolSizeMax = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax");
-        if(threadPoolSizeMax == 0)
-        {
-            threadPoolSizeMax = properties->getPropertyAsInt(_name + ".ThreadPool.SizeMax");
-        }
+        _threadPerConnection = properties->getPropertyAsInt(_name + ".ThreadPerConnection") > 0;
 
+        int threadPoolSize = properties->getPropertyAsInt(_name + ".ThreadPool.Size");
+        int threadPoolSizeMax = properties->getPropertyAsInt(_name + ".ThreadPool.SizeMax");
         if(_threadPerConnection && (threadPoolSize > 0 || threadPoolSizeMax > 0))
         {
             InitializationException ex(__FILE__, __LINE__);
@@ -824,7 +788,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
         if(_threadPerConnection)
         {
             int stackSize = 
-                properties->getPropertyAsIntWithDefault(_propertyPrefix + _name + ".ThreadPerConnection.StackSize",
+                properties->getPropertyAsIntWithDefault(_name + ".ThreadPerConnection.StackSize",
                                                         static_cast<Int>(_instance->threadPerConnectionStackSize()));
             if(stackSize < 0)
             {
@@ -843,26 +807,13 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
         //
         if(threadPoolSize > 0 || threadPoolSizeMax > 0)
         {
-            if(!properties->getProperty(_propertyPrefix + _name + ".ThreadPool.Size").empty() ||
-               !properties->getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").empty())
-            {
-                _threadPool = new ThreadPool(_instance, _propertyPrefix + _name + ".ThreadPool", 0);
-            }
-            else
-            {
-                _threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0);
-            }
+            _threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0);
         }
 
         if(!router)
         {
             const_cast<RouterPrx&>(router) = RouterPrx::uncheckedCast(
-                _instance->proxyFactory()->propertyToProxy(_propertyPrefix + _name + ".Router"));
-            if(!router)
-            {
-                const_cast<RouterPrx&>(router) = RouterPrx::uncheckedCast(
-                    _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
-            }
+                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
         }
         if(router)
         {
@@ -913,8 +864,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
             vector<EndpointIPtr> endpoints;
             if(endpointInfo.empty())
             {
-                endpoints = parseEndpoints(properties->getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints",
-                        properties->getProperty(_name + ".Endpoints")));
+                endpoints = parseEndpoints(properties->getProperty(_name + ".Endpoints"));
             }
             else
             {
@@ -938,8 +888,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
             // Parse published endpoints. If set, these are used in proxies
             // instead of the connection factory endpoints. 
             //
-            string endpts = properties->getPropertyWithDefault(_propertyPrefix + _name + ".PublishedEndpoints",
-                        properties->getProperty(_name + ".PublishedEndpoints"));
+            string endpts = properties->getProperty(_name + ".PublishedEndpoints");
             _publishedEndpoints = parseEndpoints(endpts);
             if(_publishedEndpoints.empty())
             {
@@ -954,12 +903,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
                                       not1(Ice::constMemFun(&EndpointI::publish))), _publishedEndpoints.end());
         }
 
-        string locatorProperty = _propertyPrefix + _name + ".Locator";
-        if(!properties->getProperty(locatorProperty).empty())
-        {
-            setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(locatorProperty)));
-        }
-        else if(!properties->getProperty(_name + ".Locator").empty())
+        if(!properties->getProperty(_name + ".Locator").empty())
         {
             setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
         }
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index b61b7e3e1a7..953bbdc2bc6 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -126,8 +126,6 @@ private:
     bool _threadPerConnection;
     size_t _threadPerConnectionStackSize;
 
-    static std::string _propertyPrefix;
-
     class ProcessI : public Process
     {
     public:
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index d50446621b9..3a5c7d398bc 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-// Generated by makeprops.py from file `./config/PropertyNames.def', Tue Feb 13 09:45:20 2007
+// Generated by makeprops.py from file `../config/PropertyNames.def', Wed Feb 14 09:38:50 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -55,19 +55,6 @@ const char* IceInternal::PropertyNames::IceProps[] =
     "Ice.MonitorConnections",
     "Ice.Nohup",
     "Ice.NullHandleAbort",
-    "Ice.OA.*.AdapterId",
-    "Ice.OA.*.Endpoints",
-    "Ice.OA.*.Locator",
-    "Ice.OA.*.PublishedEndpoints",
-    "Ice.OA.*.RegisterProcess",
-    "Ice.OA.*.ReplicaGroupId",
-    "Ice.OA.*.Router",
-    "Ice.OA.*.ThreadPerConnection",
-    "Ice.OA.*.ThreadPerConnection.StackSize",
-    "Ice.OA.*.ThreadPool.Size",
-    "Ice.OA.*.ThreadPool.SizeMax",
-    "Ice.OA.*.ThreadPool.SizeWarn",
-    "Ice.OA.*.ThreadPool.StackSize",
     "Ice.Override.Compress",
     "Ice.Override.ConnectTimeout",
     "Ice.Override.Timeout",
@@ -119,10 +106,14 @@ const char* IceInternal::PropertyNames::IceBoxProps[] =
     "IceBox.PrintServicesReady",
     "IceBox.Service.*",
     "IceBox.ServiceManager.AdapterId",
-    "IceBox.ServiceManager.ReplicaGroupId",
     "IceBox.ServiceManager.Endpoints",
+    "IceBox.ServiceManager.Locator",
     "IceBox.ServiceManager.PublishedEndpoints",
     "IceBox.ServiceManager.RegisterProcess",
+    "IceBox.ServiceManager.ReplicaGroupId",
+    "IceBox.ServiceManager.Router",
+    "IceBox.ServiceManager.ThreadPerConnection",
+    "IceBox.ServiceManager.ThreadPerConnection.StackSize",
     "IceBox.ServiceManager.ThreadPool.Size",
     "IceBox.ServiceManager.ThreadPool.SizeMax",
     "IceBox.ServiceManager.ThreadPool.SizeWarn",
@@ -148,18 +139,22 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
     "IceGrid.AdminGUI.Endpoints",
     "IceGrid.InstanceName",
     "IceGrid.Node.AdapterId",
-    "IceGrid.Node.ReplicaGroupId",
-    "IceGrid.Node.RegisterProcess",
     "IceGrid.Node.CollocateRegistry",
     "IceGrid.Node.Data",
     "IceGrid.Node.DisableOnFailure",
     "IceGrid.Node.Endpoints",
+    "IceGrid.Node.Locator",
     "IceGrid.Node.Name",
     "IceGrid.Node.Output",
     "IceGrid.Node.PrintServersReady",
     "IceGrid.Node.PropertiesOverride",
     "IceGrid.Node.PublishedEndpoints",
     "IceGrid.Node.RedirectErrToOut",
+    "IceGrid.Node.RegisterProcess",
+    "IceGrid.Node.ReplicaGroupId",
+    "IceGrid.Node.Router",
+    "IceGrid.Node.ThreadPerConnection",
+    "IceGrid.Node.ThreadPerConnection.StackSize",
     "IceGrid.Node.ThreadPool.Size",
     "IceGrid.Node.ThreadPool.SizeMax",
     "IceGrid.Node.ThreadPool.SizeWarn",
@@ -180,15 +175,6 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
     "IceGrid.Node.UserAccountMapper.CollocationOptimization",
     "IceGrid.Node.UserAccountMapper.ThreadPerConnection",
     "IceGrid.Node.WaitTime",
-    "IceGrid.Registry.SessionManager.AdapterId",
-    "IceGrid.Registry.SessionManager.ReplicaGroupId",
-    "IceGrid.Registry.SessionManager.Endpoints",
-    "IceGrid.Registry.SessionManager.PublishedEndpoints",
-    "IceGrid.Registry.SessionManager.RegisterProcess",
-    "IceGrid.Registry.SessionManager.ThreadPool.Size",
-    "IceGrid.Registry.SessionManager.ThreadPool.SizeMax",
-    "IceGrid.Registry.SessionManager.ThreadPool.SizeWarn",
-    "IceGrid.Registry.SessionManager.ThreadPool.StackSize",
     "IceGrid.Registry.AdminCryptPasswords",
     "IceGrid.Registry.AdminPermissionsVerifier",
     "IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection",
@@ -209,10 +195,14 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
     "IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization",
     "IceGrid.Registry.AdminSSLPermissionsVerifier.ThreadPerConnection",
     "IceGrid.Registry.Client.AdapterId",
-    "IceGrid.Registry.Client.ReplicaGroupId",
     "IceGrid.Registry.Client.Endpoints",
+    "IceGrid.Registry.Client.Locator",
     "IceGrid.Registry.Client.PublishedEndpoints",
     "IceGrid.Registry.Client.RegisterProcess",
+    "IceGrid.Registry.Client.ReplicaGroupId",
+    "IceGrid.Registry.Client.Router",
+    "IceGrid.Registry.Client.ThreadPerConnection",
+    "IceGrid.Registry.Client.ThreadPerConnection.StackSize",
     "IceGrid.Registry.Client.ThreadPool.Size",
     "IceGrid.Registry.Client.ThreadPool.SizeMax",
     "IceGrid.Registry.Client.ThreadPool.SizeWarn",
@@ -222,10 +212,14 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
     "IceGrid.Registry.DefaultTemplates",
     "IceGrid.Registry.DynamicRegistration",
     "IceGrid.Registry.Internal.AdapterId",
-    "IceGrid.Registry.Internal.ReplicaGroupId",
     "IceGrid.Registry.Internal.Endpoints",
+    "IceGrid.Registry.Internal.Locator",
     "IceGrid.Registry.Internal.PublishedEndpoints",
     "IceGrid.Register.Internal.RegisterProcess",
+    "IceGrid.Registry.Internal.ReplicaGroupId",
+    "IceGrid.Registry.Internal.Router",
+    "IceGrid.Registry.Internal.ThreadPerConnection",
+    "IceGrid.Registry.Internal.ThreadPerConnection.StackSize",
     "IceGrid.Registry.Internal.ThreadPool.Size",
     "IceGrid.Registry.Internal.ThreadPool.SizeMax",
     "IceGrid.Registry.Internal.ThreadPool.SizeWarn",
@@ -243,14 +237,31 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
     "IceGrid.Registry.ReplicaName",
     "IceGrid.Registry.ReplicaSessionTimeout",
     "IceGrid.Registry.Server.AdapterId",
-    "IceGrid.Registry.Server.ReplicaGroupId",
     "IceGrid.Registry.Server.Endpoints",
+    "IceGrid.Registry.Server.Locator",
     "IceGrid.Registry.Server.PublishedEndpoints",
     "IceGrid.Registry.Server.RegisterProcess",
+    "IceGrid.Registry.Server.ReplicaGroupId",
+    "IceGrid.Registry.Server.Router",
+    "IceGrid.Registry.Server.ThreadPerConnection",
+    "IceGrid.Registry.Server.ThreadPerConnection.StackSize",
     "IceGrid.Registry.Server.ThreadPool.Size",
     "IceGrid.Registry.Server.ThreadPool.SizeMax",
     "IceGrid.Registry.Server.ThreadPool.SizeWarn",
     "IceGrid.Registry.Server.ThreadPool.StackSize",
+    "IceGrid.Registry.SessionManager.AdapterId",
+    "IceGrid.Registry.SessionManager.Endpoints",
+    "IceGrid.Registry.SessionManager.Locator",
+    "IceGrid.Registry.SessionManager.PublishedEndpoints",
+    "IceGrid.Registry.SessionManager.RegisterProcess",
+    "IceGrid.Registry.SessionManager.ReplicaGroupId",
+    "IceGrid.Registry.SessionManager.Router",
+    "IceGrid.Registry.SessionManager.ThreadPerConnection",
+    "IceGrid.Registry.SessionManager.ThreadPerConnection.StackSize",
+    "IceGrid.Registry.SessionManager.ThreadPool.Size",
+    "IceGrid.Registry.SessionManager.ThreadPool.SizeMax",
+    "IceGrid.Registry.SessionManager.ThreadPool.SizeWarn",
+    "IceGrid.Registry.SessionManager.ThreadPool.StackSize",
     "IceGrid.Registry.SessionTimeout",
     "IceGrid.Registry.SSLPermissionsVerifier",
     "IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection",
@@ -277,12 +288,15 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
 const char* IceInternal::PropertyNames::IcePatch2Props[] =
 {
     "IcePatch2.AdapterId",
-    "IcePatch2.ReplicaGroupId",
     "IcePatch2.Admin.AdapterId",
-    "IcePatch2.Admin.ReplicaGroupId",
     "IcePatch2.Admin.Endpoints",
+    "IcePatch2.Admin.Locator",
     "IcePatch2.Admin.PublishedEndpoints",
     "IcePatch2.Admin.RegisterProcess",
+    "IcePatch2.Admin.ReplicaGroupId",
+    "IcePatch2.Admin.Router",
+    "IcePatch2.Admin.ThreadPerConnection",
+    "IcePatch2.Admin.ThreadPerConnection.StackSize",
     "IcePatch2.Admin.ThreadPool.Size",
     "IcePatch2.Admin.ThreadPool.SizeMax",
     "IcePatch2.Admin.ThreadPool.SizeWarn",
@@ -291,10 +305,15 @@ const char* IceInternal::PropertyNames::IcePatch2Props[] =
     "IcePatch2.Directory",
     "IcePatch2.Endpoints",
     "IcePatch2.InstanceName",
+    "IcePatch2.Locator",
     "IcePatch2.PublishedEndpoints",
     "IcePatch2.RegisterProcess",
+    "IcePatch2.ReplicaGroupId",
     "IcePatch2.Remove",
+    "IcePatch2.Router",
     "IcePatch2.Thorough",
+    "IcePatch2.ThreadPerConnection",
+    "IcePatch2.ThreadPerConnection.StackSize",
     "IcePatch2.ThreadPool.Size",
     "IcePatch2.ThreadPool.SizeMax",
     "IcePatch2.ThreadPool.SizeWarn",
@@ -348,17 +367,21 @@ const char* IceInternal::PropertyNames::IceStormProps[] =
     "IceStorm.Flush.Timeout",
     "IceStorm.InstanceName",
     "IceStorm.Publish.AdapterId",
-    "IceStorm.Publish.ReplicaGroupId",
     "IceStorm.Publish.Endpoints",
+    "IceStorm.Publish.Locator",
     "IceStorm.Publish.PublishedEndpoints",
     "IceStorm.Publish.RegisterProcess",
+    "IceStorm.Publish.ReplicaGroupId",
+    "IceStorm.Publish.Router",
+    "IceStorm.Publish.ThreadPerConnection",
+    "IceStorm.Publish.ThreadPerConnection.StackSize",
     "IceStorm.Publish.ThreadPool.Size",
     "IceStorm.Publish.ThreadPool.SizeMax",
     "IceStorm.Publish.ThreadPool.SizeWarn",
     "IceStorm.Publish.ThreadPool.StackSize",
     "IceStorm.TopicManager.AdapterId",
-    "IceStorm.TopicManager.ReplicaGroupId",
     "IceStorm.TopicManager.Endpoints",
+    "IceStorm.TopicManager.Locator",
     "IceStorm.TopicManager.Proxy",
     "IceStorm.TopicManager.Proxy.EndpointSelection",
     "IceStorm.TopicManager.Proxy.ConnectionCached",
@@ -370,6 +393,10 @@ const char* IceInternal::PropertyNames::IceStormProps[] =
     "IceStorm.TopicManager.Proxy.ThreadPerConnection",
     "IceStorm.TopicManager.PublishedEndpoints",
     "IceStorm.TopicManager.RegisterProcess",
+    "IceStorm.TopicManager.ReplicaGroupId",
+    "IceStorm.TopicManager.Router",
+    "IceStorm.TopicManager.ThreadPerConnection",
+    "IceStorm.TopicManager.ThreadPerConnection.StackSize",
     "IceStorm.TopicManager.ThreadPool.Size",
     "IceStorm.TopicManager.ThreadPool.SizeMax",
     "IceStorm.TopicManager.ThreadPool.SizeWarn",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 53feb6627b7..a05bab33650 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-// Generated by makeprops.py from file `./config/PropertyNames.def', Tue Feb 13 09:45:20 2007
+// Generated by makeprops.py from file `../config/PropertyNames.def', Wed Feb 14 09:38:50 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 74234008973..fce10f5681d 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -92,15 +92,10 @@ Client::run(int argc, char* argv[])
     string managerProxy;
     if(properties->getProperty("Ice.Default.Locator").empty())
     {
-        //
-        // DEPRECATED PROPERTY: Remove extra code in future release.
-        //
-        string managerEndpoints = 
-            properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints",
-                                               properties->getProperty("IceBox.ServiceManager.Endpoints"));
+        string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints");
         if(managerEndpoints.empty())
         {
-            cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.Endpoints' is not set" << endl;
+            cerr << appName() << ": property `IceBox.ServiceManager.Endpoints' is not set" << endl;
             return EXIT_FAILURE;
         }
 
@@ -108,15 +103,10 @@ Client::run(int argc, char* argv[])
     }
     else
     {
-        //
-        // DEPRECATED PROPERTY: Remove extra code in future release.
-        //
-        string managerAdapterId = 
-            properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId",
-                                               properties->getProperty("IceBox.ServiceManager.AdapterId"));
+        string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId");
         if(managerAdapterId.empty())
         {
-            cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.AdapterId' is not set" << endl;
+            cerr << appName() << ": property `IceBox.ServiceManager.AdapterId' is not set" << endl;
             return EXIT_FAILURE;
         }
 
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index 64b3f472bed..07453c4af41 100755
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -156,9 +156,8 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe
 {
     PropertiesPtr properties = communicator->getProperties();
 
-    const char* endpointsProperty = "Ice.OA.IcePatch2.Endpoints";
-    string endpoints = properties->getPropertyWithDefault(endpointsProperty,
-                                                          properties->getProperty("IcePatch2.Endpoints"));
+    const char* endpointsProperty = "IcePatch2.Endpoints";
+    string endpoints = properties->getProperty(endpointsProperty);
     if(endpoints.empty())
     {
         throw string("property `") + endpointsProperty + "' is not set";
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 9b654414caf..814fb3f42cd 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -141,12 +141,8 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
         return false;
     }
     
-    //
-    // DEPRECATED PROPERTY: Remove extra code in future release
-    //
-    const string endpointsProperty = "Ice.OA.IcePatch2.Endpoints";
-    string endpoints = properties->getPropertyWithDefault(endpointsProperty,
-                                                          properties->getProperty("IcePatch2.Endpoints"));
+    const string endpointsProperty = "IcePatch2.Endpoints";
+    string endpoints = properties->getProperty(endpointsProperty);
     if(endpoints.empty())
     {
         error("property `" + endpointsProperty + "' is not set");
@@ -154,12 +150,8 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
     }
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("IcePatch2");
 
-    //
-    // DEPRECATED PROPERTY: Remove extra code in future release
-    //
     ObjectAdapterPtr adminAdapter;
-    if(!properties->getProperty("Ice.OA.IcePatch2.Admin.Endpoints").empty() ||
-       !properties->getProperty("IcePatch2.Admin.Endpoints").empty())
+    if(!properties->getProperty("IcePatch2.Admin.Endpoints").empty())
     {
         adminAdapter = communicator()->createObjectAdapter("IcePatch2.Admin");
     }