diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-08-22 00:06:02 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-08-22 00:06:02 +0000 |
| commit | a21245de493fd741e3a561adfdb1ca951c30145c (patch) | |
| tree | 566960b5671ec08fb74b15e45a0084c7e24b7ec9 /java/src | |
| parent | minor reorg (diff) | |
| download | ice-a21245de493fd741e3a561adfdb1ca951c30145c.tar.bz2 ice-a21245de493fd741e3a561adfdb1ca951c30145c.tar.xz ice-a21245de493fd741e3a561adfdb1ca951c30145c.zip | |
bug 1156: removing deprecated Identity properties
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceBox/Admin.java | 9 | ||||
| -rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 6 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 7 |
3 files changed, 4 insertions, 18 deletions
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index 4a76e2088f4..b1c1c14af0e 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -59,15 +59,10 @@ public final class Admin Ice.Properties properties = communicator().getProperties(); - String managerIdentity = properties.getProperty("IceBox.ServiceManager.Identity"); - if(managerIdentity.length() == 0) - { - managerIdentity = - properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; - } + String managerIdentity = + properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; String managerProxy; - if(properties.getProperty("Ice.Default.Locator").length() == 0) { String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints"); diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 34b60b09195..3c44b25e6e0 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -49,11 +49,7 @@ public class ServiceManagerI extends _ServiceManagerDisp Ice.Properties properties = _server.communicator().getProperties(); - String identity = properties.getProperty("IceBox.ServiceManager.Identity"); - if(identity.length() == 0) - { - identity = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; - } + String identity = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; adapter.add(this, _server.communicator().stringToIdentity(identity)); // diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 5d1147362a4..9a7bb817658 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `./PropertyNames.def', Wed Jul 26 17:13:49 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Aug 21 16:37:24 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -87,7 +87,6 @@ public final class PropertyNames "^IceBox\\.ServiceManager\\.AdapterId$", "^IceBox\\.ServiceManager\\.ReplicaGroupId$", "^IceBox\\.ServiceManager\\.Endpoints$", - "^IceBox\\.ServiceManager\\.Identity$", "^IceBox\\.ServiceManager\\.PublishedEndpoints$", "^IceBox\\.ServiceManager\\.RegisterProcess$", "^IceBox\\.ServiceManager\\.ThreadPool\\.Size$", @@ -202,11 +201,9 @@ public final class PropertyNames "^IcePatch2\\.Admin\\.ThreadPool\\.SizeMax$", "^IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn$", "^IcePatch2\\.Admin\\.ThreadPool\\.StackSize$", - "^IcePatch2\\.AdminIdentity$", "^IcePatch2\\.ChunkSize$", "^IcePatch2\\.Directory$", "^IcePatch2\\.Endpoints$", - "^IcePatch2\\.Identity$", "^IcePatch2\\.InstanceName$", "^IcePatch2\\.PublishedEndpoints$", "^IcePatch2\\.RegisterProcess$", @@ -288,7 +285,6 @@ public final class PropertyNames { "^Glacier2\\.AddUserToAllowCategories$", "^Glacier2\\.Admin\\.Endpoints$", - "^Glacier2\\.AdminIdentity$", "^Glacier2\\.Admin\\.PublishedEndpoints$", "^Glacier2\\.Admin\\.RegisterProcess$", "^Glacier2\\.AllowCategories$", @@ -312,7 +308,6 @@ public final class PropertyNames "^Glacier2\\.InstanceName$", "^Glacier2\\.PermissionsVerifier$", "^Glacier2\\.SSLPermissionsVerifier$", - "^Glacier2\\.RouterIdentity$", "^Glacier2\\.RoutingTable\\.MaxSize$", "^Glacier2\\.Server\\.AlwaysBatch$", "^Glacier2\\.Server\\.Buffered$", |