summaryrefslogtreecommitdiff
path: root/java/src/IceBox/Admin.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceBox/Admin.java')
-rw-r--r--java/src/IceBox/Admin.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index 0bc82241717..04397bb6fdb 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -68,7 +68,12 @@ public final class Admin
String managerProxy;
if(properties.getProperty("Ice.Default.Locator").length() == 0)
{
- String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
+ //
+ // DEPREACTED PROPERTIES: Remove extra code in future release.
+ //
+ String managerEndpoints =
+ properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints",
+ properties.getProperty("IceBox.ServiceManager.Endpoints"));
if(managerEndpoints.length() == 0)
{
System.err.println(appName() + ": property `IceBox.ServiceManager.Endpoints' is not set");
@@ -79,7 +84,12 @@ public final class Admin
}
else
{
- String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
+ //
+ // DEPREACTED PROPERTIES: Remove extra code in future release.
+ //
+ String managerAdapterId =
+ properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId",
+ properties.getProperty("IceBox.ServiceManager.AdapterId"));
if(managerAdapterId.length() == 0)
{
System.err.println(appName() + ": property `IceBox.ServiceManager.AdapterId' is not set");