diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-11-15 13:15:18 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-11-15 13:15:18 +0000 |
| commit | 55b219faf0332efe7993f31fc952f8f96e3490d6 (patch) | |
| tree | 69676d8a12a3730abad03ae005f227f02594a2dc /java/src | |
| parent | Added new demos to demo project (diff) | |
| download | ice-55b219faf0332efe7993f31fc952f8f96e3490d6.tar.bz2 ice-55b219faf0332efe7993f31fc952f8f96e3490d6.tar.xz ice-55b219faf0332efe7993f31fc952f8f96e3490d6.zip | |
Fixes
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceBox/Admin.java | 33 | ||||
| -rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 2 |
2 files changed, 20 insertions, 15 deletions
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index 8e1c7b8cd18..631c5a9368a 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -58,39 +58,44 @@ public final class Admin } Ice.Properties properties = communicator().getProperties(); - String namePrefix = properties.getProperty("IceBox.Name"); - if(namePrefix.length() > 0) + + String managerIdentity = properties.getProperty("IceBox.ServiceManager.Identity"); + if(managerIdentity.length() == 0) { - namePrefix += "."; + managerIdentity = + properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; } String managerProxy; - String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints"); - if(managerEndpoints.length() == 0) + if(properties.getProperty("Ice.Default.Locator").length() == 0) { - if(properties.getProperty("Ice.Default.Locator").length() > 0 && namePrefix.length() > 0) - { - managerProxy = namePrefix + "ServiceManager@" + namePrefix + "ServiceManagerAdapter"; - } - else + String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints"); + if(managerEndpoints.length() == 0) { System.err.println(appName() + ": property `IceBox.ServiceManager.Endpoints' is not set"); return 1; } + + managerProxy = managerIdentity + ":" + managerEndpoints; } else { - String managerIdentity = properties.getPropertyWithDefault("IceBox.ServiceManager.Identity", - "ServiceManager"); - managerProxy = namePrefix + managerIdentity + ":" + managerEndpoints; + String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId"); + if(managerAdapterId.length() == 0) + { + System.err.println(appName() + ": property `IceBox.ServiceManager.AdapterId' is not set"); + return 1; + } + + managerProxy = managerIdentity + ":" + managerAdapterId; } Ice.ObjectPrx base = communicator().stringToProxy(managerProxy); IceBox.ServiceManagerPrx manager = IceBox.ServiceManagerPrxHelper.checkedCast(base); if(manager == null) { - System.err.println(appName() + ": `" + managerEndpoints + "' is not running"); + System.err.println(appName() + ": `" + managerProxy + "' is not running"); return 1; } diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index ae650f8e5fa..34634a03b34 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -49,7 +49,7 @@ public class ServiceManagerI extends _ServiceManagerDisp Ice.Properties properties = _server.communicator().getProperties(); - String identity = properties.getPropertyWithDefault("IceBox.ServiceManager.Identity", "ServiceManager"); + String identity = properties.getProperty("IceBox.ServiceManager.Identity"); if(identity.length() == 0) { identity = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; |