1 files changed, 44 insertions, 19 deletions

diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index dc4b09ce6e8..cc07c398ee2 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -160,48 +160,63 @@ RegistryI::start(bool nowarn)
     //
     // Check that required properties are set and valid.
     //
-    if(properties->getProperty("IceGrid.Registry.Client.Endpoints").empty())
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
+    if(properties->getProperty("Ice.OA.IceGrid.Registry.Client.Endpoints").empty() &&
+       properties->getProperty("IceGrid.Registry.Client.Endpoints").empty())
     {
 	Error out(_communicator->getLogger());
-	out << "property `IceGrid.Registry.Client.Endpoints' is not set";
+	out << "property `Ice.OA.IceGrid.Registry.Client.Endpoints' is not set";
 	return false;
     }
 
-    if(properties->getProperty("IceGrid.Registry.Server.Endpoints").empty())
+    //
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
+    if(properties->getProperty("Ice.OA.IceGrid.Registry.Server.Endpoints").empty() &&
+       properties->getProperty("IceGrid.Registry.Server.Endpoints").empty())
     {
 	Error out(_communicator->getLogger());
-	out << "property `IceGrid.Registry.Server.Endpoints' is not set";
+	out << "property `Ice.OA.IceGrid.Registry.Server.Endpoints' is not set";
 	return false;
     }
 
-    if(properties->getProperty("IceGrid.Registry.Internal.Endpoints").empty())
+    //
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
+    if(properties->getProperty("Ice.OA.IceGrid.Registry.Internal.Endpoints").empty() &&
+       properties->getProperty("IceGrid.Registry.Internal.Endpoints").empty())
     {
 	Error out(_communicator->getLogger());
-	out << "property `IceGrid.Registry.Internal.Endpoints' is not set";
+	out << "property `Ice.OA.IceGrid.Registry.Internal.Endpoints' is not set";
 	return false;
     }
 
-    if(!properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty())
+    //
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
+    if(!properties->getProperty("Ice.OA.IceGrid.Registry.SessionManager.Endpoints").empty() ||
+       !properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty())
     {
 	if(!nowarn)
 	{
 	    Warning out(_communicator->getLogger());
-	    out << "session manager endpoints `IceGrid.Registry.SessionManager.Endpoints' enabled";
+	    out << "session manager endpoints `Ice.OA.IceGrid.Registry.SessionManager.Endpoints' enabled";
 	}
     }
 
     properties->setProperty("Ice.PrintProcessId", "0");
     properties->setProperty("Ice.ServerIdleTime", "0");
-    properties->setProperty("IceGrid.Registry.Client.AdapterId", "");
-    properties->setProperty("IceGrid.Registry.Server.AdapterId", "");
-    properties->setProperty("IceGrid.Registry.SessionManager.AdapterId", "");
-    properties->setProperty("IceGrid.Registry.Internal.AdapterId", "");
+    properties->setProperty("Ice.OA.IceGrid.Registry.Client.AdapterId", "");
+    properties->setProperty("Ice.OA.IceGrid.Registry.Server.AdapterId", "");
+    properties->setProperty("Ice.OA.IceGrid.Registry.SessionManager.AdapterId", "");
+    properties->setProperty("Ice.OA.IceGrid.Registry.Internal.AdapterId", "");
 
     setupThreadPool(properties, "Ice.ThreadPool.Client", 1, 100);
-    setupThreadPool(properties, "IceGrid.Registry.Client.ThreadPool", 1, 10);
-    setupThreadPool(properties, "IceGrid.Registry.Server.ThreadPool", 1, 10);
-    setupThreadPool(properties, "IceGrid.Registry.SessionManager.ThreadPool", 1, 10);
-    setupThreadPool(properties, "IceGrid.Registry.Internal.ThreadPool", 1, 100);
+    setupThreadPool(properties, "Ice.OA.IceGrid.Registry.Client.ThreadPool", 1, 10);
+    setupThreadPool(properties, "Ice.OA.IceGrid.Registry.Server.ThreadPool", 1, 10);
+    setupThreadPool(properties, "Ice.OA.IceGrid.Registry.SessionManager.ThreadPool", 1, 10);
+    setupThreadPool(properties, "Ice.OA.IceGrid.Registry.Internal.ThreadPool", 1, 100);
 
     _replicaName = properties->getPropertyWithDefault("IceGrid.Registry.ReplicaName", "Master");
     _master = _replicaName == "Master";
@@ -244,12 +259,18 @@ RegistryI::start(bool nowarn)
     //
     try
     {
-	string strPrx = _instanceName + "/Locator:" + properties->getProperty("IceGrid.Registry.Client.Endpoints");
+        //
+	// DEPRECATED PROPERTY: Remove extra code in future release
+	//
+        string endpoints = 
+	    properties->getPropertyWithDefault("Ice.OA.IceGrid.Registry.Client.Endpoints",
+					       properties->getProperty("IceGrid.Registry.Client.Endpoints"));
+	string strPrx = _instanceName + "/Locator:" + endpoints;
 	_communicator->stringToProxy(strPrx)->ice_timeout(5000)->ice_ping();
 
 	Error out(_communicator->getLogger());
 	out << "an IceGrid registry is already running and listening on\n";
-	out << "the client endpoints `" << properties->getProperty("IceGrid.Registry.Client.Endpoints") << "'";
+	out << "the client endpoints `" << endpoints << "'";
 	return false;
     }
     catch(const Ice::LocalException&)
@@ -333,7 +354,11 @@ RegistryI::start(bool nowarn)
     ObjectAdapterPtr serverAdapter = _communicator->createObjectAdapter("IceGrid.Registry.Server");
     _clientAdapter = _communicator->createObjectAdapter("IceGrid.Registry.Client");
     ObjectAdapterPtr sessionManagerAdapter;
-    if(!properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty())
+    //
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
+    if(!properties->getProperty("Ice.OA.IceGrid.Registry.SessionManager.Endpoints").empty() ||
+       !properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty())
     {
 	sessionManagerAdapter = _communicator->createObjectAdapter("IceGrid.Registry.SessionManager");
     }