Object adapter properties now prefixed by "Ice.OA."

2 files changed, 18 insertions, 9 deletions

diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index 6c2d9f60673..ba6bb4c1e6a 100755
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -156,11 +156,12 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe
 {
     PropertiesPtr properties = communicator->getProperties();
 
-    const char* endpointsProperty = "IcePatch2.Endpoints";
-    const string endpoints = properties->getProperty(endpointsProperty);
+    const char* endpointsProperty = "Ice.OA.IcePatch2.Endpoints";
+    string endpoints = properties->getPropertyWithDefault(endpointsProperty,
+    							  properties->getProperty("IcePatch2.Endpoints"));
     if(endpoints.empty())
     {
-	throw string("property `") + endpointsProperty + "' is not set";
+        throw string("property `") + endpointsProperty + "' is not set";
     }
 
     Identity id;
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index ed1e102c400..e285545c049 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -141,17 +141,25 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
         return false;
     }
     
-    const string endpointsProperty = "IcePatch2.Endpoints";
-    if(properties->getProperty(endpointsProperty).empty())
+    //
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
+    const string endpointsProperty = "Ice.OA.IcePatch2.Endpoints";
+    string endpoints = properties->getPropertyWithDefault(endpointsProperty,
+    							  properties->getProperty("IcePatch2.Endpoints"));
+    if(endpoints.empty())
     {
-	error("property `" + endpointsProperty + "' is not set");
-	return false;
+        error("property `" + endpointsProperty + "' is not set");
+        return false;
     }
     ObjectAdapterPtr adapter = communicator()->createObjectAdapter("IcePatch2");
 
-    const string adminEndpointsProperty = "IcePatch2.Admin.Endpoints";
+    //
+    // DEPRECATED PROPERTY: Remove extra code in future release
+    //
     ObjectAdapterPtr adminAdapter;
-    if(!properties->getProperty(adminEndpointsProperty).empty())
+    if(!properties->getProperty("Ice.OA.IcePatch2.Admin.Endpoints").empty() ||
+       !properties->getProperty("IcePatch2.Admin.Endpoints").empty())
     {
 	adminAdapter = communicator()->createObjectAdapter("IcePatch2.Admin");
     }