From d07fdae285690f699a70f97f36232e516dcad2bc Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Mon, 18 Dec 2006 17:06:44 +0000 Subject: Object adapter properties now prefixed by "Ice.OA." --- java/src/IceBox/Admin.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'java/src/IceBox/Admin.java') 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"); -- cgit v1.2.3