Fixed ICE-4861 Review deprecated APIs

4 files changed, 1 insertions, 94 deletions

diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 17587de0a9e..e4126ac7a1d 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -22,11 +22,6 @@ public interface ObjectPrx
     Communicator ice_getCommunicator();
 
     /**
-     * @deprecated This method is deprecated, use toString instead.
-     **/
-    String ice_toString();
-
-    /**
      * Tests whether this object supports a specific Slice interface.
      *
      * @param __id The type ID of the Slice interface to test against.
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index bd5e7b0ccd7..7f62f46ab80 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -50,15 +50,6 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
     }
 
     /**
-     * @deprecated
-     **/
-    public final String
-    ice_toString()
-    {
-        return toString();
-    }
-
-    /**
      * Tests whether this proxy supports a given interface.
      *
      * @param __id The Slice type ID of an interface.
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index c18e1222b82..193c747508c 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -329,15 +329,6 @@ public final class Util
     }
 
     /**
-     * @deprecated generateUUID() is deprecated, use java.util.UUID instead.
-     **/
-    public static String
-    generateUUID()
-    {
-    	return java.util.UUID.randomUUID().toString();
-    }
-
-    /**
      * Compares the object identities of two proxies.
      *
      * @param lhs A proxy.
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 10fed5d53bd..694aebea5d2 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Thu Oct 11 00:04:00 2012
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Oct 22 18:48:40 2012
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -30,11 +30,9 @@ public final class PropertyNames
         new Property("Ice\\.Admin\\.Locator\\.Locator", false, null),
         new Property("Ice\\.Admin\\.Locator\\.Router", false, null),
         new Property("Ice\\.Admin\\.Locator\\.EncodingVersion", false, null),
-        new Property("Ice\\.Admin\\.Locator\\.CollocationOptimization", true, "Ice.Admin.Locator.CollocationOptimized"),
         new Property("Ice\\.Admin\\.Locator\\.CollocationOptimized", false, null),
         new Property("Ice\\.Admin\\.Locator", false, null),
         new Property("Ice\\.Admin\\.PublishedEndpoints", false, null),
-        new Property("Ice\\.Admin\\.RegisterProcess", true, null),
         new Property("Ice\\.Admin\\.ReplicaGroupId", false, null),
         new Property("Ice\\.Admin\\.Router\\.EndpointSelection", false, null),
         new Property("Ice\\.Admin\\.Router\\.ConnectionCached", false, null),
@@ -43,7 +41,6 @@ public final class PropertyNames
         new Property("Ice\\.Admin\\.Router\\.Locator", false, null),
         new Property("Ice\\.Admin\\.Router\\.Router", false, null),
         new Property("Ice\\.Admin\\.Router\\.EncodingVersion", false, null),
-        new Property("Ice\\.Admin\\.Router\\.CollocationOptimization", true, "Ice.Admin.Router.CollocationOptimized"),
         new Property("Ice\\.Admin\\.Router\\.CollocationOptimized", false, null),
         new Property("Ice\\.Admin\\.Router", false, null),
         new Property("Ice\\.Admin\\.ProxyOptions", false, null),
@@ -64,7 +61,6 @@ public final class PropertyNames
         new Property("Ice\\.Compression\\.Level", false, null),
         new Property("Ice\\.Config", false, null),
         new Property("Ice\\.ConsoleListener", false, null),
-        new Property("Ice\\.Default\\.CollocationOptimization", true, "Ice.Default.CollocationOptimized"),
         new Property("Ice\\.Default\\.CollocationOptimized", false, null),
         new Property("Ice\\.Default\\.EncodingVersion", false, null),
         new Property("Ice\\.Default\\.EndpointSelection", false, null),
@@ -76,7 +72,6 @@ public final class PropertyNames
         new Property("Ice\\.Default\\.Locator\\.Locator", false, null),
         new Property("Ice\\.Default\\.Locator\\.Router", false, null),
         new Property("Ice\\.Default\\.Locator\\.EncodingVersion", false, null),
-        new Property("Ice\\.Default\\.Locator\\.CollocationOptimization", true, "Ice.Default.Locator.CollocationOptimized"),
         new Property("Ice\\.Default\\.Locator\\.CollocationOptimized", false, null),
         new Property("Ice\\.Default\\.Locator", false, null),
         new Property("Ice\\.Default\\.LocatorCacheTimeout", false, null),
@@ -90,7 +85,6 @@ public final class PropertyNames
         new Property("Ice\\.Default\\.Router\\.Locator", false, null),
         new Property("Ice\\.Default\\.Router\\.Router", false, null),
         new Property("Ice\\.Default\\.Router\\.EncodingVersion", false, null),
-        new Property("Ice\\.Default\\.Router\\.CollocationOptimization", true, "Ice.Default.Router.CollocationOptimized"),
         new Property("Ice\\.Default\\.Router\\.CollocationOptimized", false, null),
         new Property("Ice\\.Default\\.Router", false, null),
         new Property("Ice\\.Default\\.SlicedFormat", false, null),
@@ -119,7 +113,6 @@ public final class PropertyNames
         new Property("Ice\\.PrintStackTraces", false, null),
         new Property("Ice\\.ProgramName", false, null),
         new Property("Ice\\.RetryIntervals", false, null),
-        new Property("Ice\\.ServerId", true, null),
         new Property("Ice\\.ServerIdleTime", false, null),
         new Property("Ice\\.StdErr", false, null),
         new Property("Ice\\.StdOut", false, null),
@@ -141,7 +134,6 @@ public final class PropertyNames
         new Property("Ice\\.ThreadPriority", false, null),
         new Property("Ice\\.Trace\\.Admin\\.Properties", false, null),
         new Property("Ice\\.Trace\\.GC", false, null),
-        new Property("Ice\\.Trace\\.Location", true, "Ice.Trace.Locator"),
         new Property("Ice\\.Trace\\.Locator", false, null),
         new Property("Ice\\.Trace\\.Network", false, null),
         new Property("Ice\\.Trace\\.Protocol", false, null),
@@ -193,11 +185,9 @@ public final class PropertyNames
         new Property("IceBox\\.ServiceManager\\.Locator\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator\\.Router", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.CollocationOptimization", true, "IceBox.ServiceManager.Locator.CollocationOptimized"),
         new Property("IceBox\\.ServiceManager\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", false, null),
-        new Property("IceBox\\.ServiceManager\\.RegisterProcess", true, null),
         new Property("IceBox\\.ServiceManager\\.ReplicaGroupId", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.EndpointSelection", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.ConnectionCached", false, null),
@@ -206,7 +196,6 @@ public final class PropertyNames
         new Property("IceBox\\.ServiceManager\\.Router\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.Router", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.EncodingVersion", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.CollocationOptimization", true, "IceBox.ServiceManager.Router.CollocationOptimized"),
         new Property("IceBox\\.ServiceManager\\.Router\\.CollocationOptimized", false, null),
         new Property("IceBox\\.ServiceManager\\.Router", false, null),
         new Property("IceBox\\.ServiceManager\\.ProxyOptions", false, null),
@@ -231,7 +220,6 @@ public final class PropertyNames
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Locator", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Router", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EncodingVersion", false, null),
-        new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimization", true, "IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized"),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimized", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy", false, null),
         null
@@ -261,11 +249,9 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.Locator\\.Router", false, null),
         new Property("IceGrid\\.Node\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Node\\.Locator\\.CollocationOptimization", true, "IceGrid.Node.Locator.CollocationOptimized"),
         new Property("IceGrid\\.Node\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Node\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Node\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Node\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Node\\.Router\\.EndpointSelection", false, null),
         new Property("IceGrid\\.Node\\.Router\\.ConnectionCached", false, null),
@@ -274,7 +260,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.Router\\.Router", false, null),
         new Property("IceGrid\\.Node\\.Router\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Node\\.Router\\.CollocationOptimization", true, "IceGrid.Node.Router.CollocationOptimized"),
         new Property("IceGrid\\.Node\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Node\\.Router", false, null),
         new Property("IceGrid\\.Node\\.ProxyOptions", false, null),
@@ -309,7 +294,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.Router", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Node\\.UserAccountMapper\\.CollocationOptimization", true, "IceGrid.Node.UserAccountMapper.CollocationOptimized"),
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper", false, null),
         new Property("IceGrid\\.Node\\.WaitTime", false, null),
@@ -321,7 +305,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.CollocationOptimization", true, "IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionFilters", false, null),
@@ -335,11 +318,9 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.CollocationOptimization", true, "IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSessionManager\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.EndpointSelection", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.ConnectionCached", false, null),
@@ -348,7 +329,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.CollocationOptimization", true, "IceGrid.Registry.AdminSessionManager.Router.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ProxyOptions", false, null),
@@ -366,7 +346,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.CollocationOptimization", true, "IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.ACM", false, null),
@@ -379,11 +358,9 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.Client\\.Locator\\.CollocationOptimization", true, "IceGrid.Registry.Client.Locator.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.Client\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.Client\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.EndpointSelection", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.ConnectionCached", false, null),
@@ -392,7 +369,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.Client\\.Router\\.CollocationOptimization", true, "IceGrid.Registry.Client.Router.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.ProxyOptions", false, null),
@@ -417,11 +393,9 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.CollocationOptimization", true, "IceGrid.Registry.Internal.Locator.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.Internal\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.Internal\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.EndpointSelection", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.ConnectionCached", false, null),
@@ -430,7 +404,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.Internal\\.Router\\.CollocationOptimization", true, "IceGrid.Registry.Internal.Router.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.ProxyOptions", false, null),
@@ -449,7 +422,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.CollocationOptimization", true, "IceGrid.Registry.PermissionsVerifier.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.ReplicaName", false, null),
@@ -466,11 +438,9 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.Server\\.Locator\\.CollocationOptimization", true, "IceGrid.Registry.Server.Locator.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.Server\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.Server\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.EndpointSelection", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.ConnectionCached", false, null),
@@ -479,7 +449,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.Server\\.Router\\.CollocationOptimization", true, "IceGrid.Registry.Server.Router.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.ProxyOptions", false, null),
@@ -501,11 +470,9 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.CollocationOptimization", true, "IceGrid.Registry.SessionManager.Locator.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.SessionManager\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.EndpointSelection", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.ConnectionCached", false, null),
@@ -514,7 +481,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.CollocationOptimization", true, "IceGrid.Registry.SessionManager.Router.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.ProxyOptions", false, null),
@@ -533,7 +499,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.EncodingVersion", false, null),
-        new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.CollocationOptimization", true, "IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized"),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.Trace\\.Application", false, null),
@@ -571,11 +536,9 @@ public final class PropertyNames
         new Property("IcePatch2\\.Locator\\.Locator", false, null),
         new Property("IcePatch2\\.Locator\\.Router", false, null),
         new Property("IcePatch2\\.Locator\\.EncodingVersion", false, null),
-        new Property("IcePatch2\\.Locator\\.CollocationOptimization", true, "IcePatch2.Locator.CollocationOptimized"),
         new Property("IcePatch2\\.Locator\\.CollocationOptimized", false, null),
         new Property("IcePatch2\\.Locator", false, null),
         new Property("IcePatch2\\.PublishedEndpoints", false, null),
-        new Property("IcePatch2\\.RegisterProcess", true, null),
         new Property("IcePatch2\\.ReplicaGroupId", false, null),
         new Property("IcePatch2\\.Router\\.EndpointSelection", false, null),
         new Property("IcePatch2\\.Router\\.ConnectionCached", false, null),
@@ -584,7 +547,6 @@ public final class PropertyNames
         new Property("IcePatch2\\.Router\\.Locator", false, null),
         new Property("IcePatch2\\.Router\\.Router", false, null),
         new Property("IcePatch2\\.Router\\.EncodingVersion", false, null),
-        new Property("IcePatch2\\.Router\\.CollocationOptimization", true, "IcePatch2.Router.CollocationOptimized"),
         new Property("IcePatch2\\.Router\\.CollocationOptimized", false, null),
         new Property("IcePatch2\\.Router", false, null),
         new Property("IcePatch2\\.ProxyOptions", false, null),
@@ -595,17 +557,6 @@ public final class PropertyNames
         new Property("IcePatch2\\.ThreadPool\\.Serialize", false, null),
         new Property("IcePatch2\\.ThreadPool\\.ThreadIdleTime", false, null),
         new Property("IcePatch2\\.ThreadPool\\.ThreadPriority", false, null),
-        new Property("IcePatch2\\.Admin\\.AdapterId", true, null),
-        new Property("IcePatch2\\.Admin\\.Endpoints", true, null),
-        new Property("IcePatch2\\.Admin\\.Locator", true, null),
-        new Property("IcePatch2\\.Admin\\.PublishedEndpoints", true, null),
-        new Property("IcePatch2\\.Admin\\.RegisterProcess", true, null),
-        new Property("IcePatch2\\.Admin\\.ReplicaGroupId", true, null),
-        new Property("IcePatch2\\.Admin\\.Router", true, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.Size", true, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.StackSize", true, null),
         new Property("IcePatch2\\.ChunkSize", false, null),
         new Property("IcePatch2\\.Directory", false, null),
         new Property("IcePatch2\\.InstanceName", false, null),
@@ -670,17 +621,6 @@ public final class PropertyNames
     {
         new Property("Glacier2\\.AddSSLContext", true, null),
         new Property("Glacier2\\.AddConnectionContext", false, null),
-        new Property("Glacier2\\.Admin\\.AdapterId", true, null),
-        new Property("Glacier2\\.Admin\\.Endpoints", true, null),
-        new Property("Glacier2\\.Admin\\.Locator", true, null),
-        new Property("Glacier2\\.Admin\\.PublishedEndpoints", true, null),
-        new Property("Glacier2\\.Admin\\.RegisterProcess", true, null),
-        new Property("Glacier2\\.Admin\\.ReplicaGroupId", true, null),
-        new Property("Glacier2\\.Admin\\.Router", true, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.Size", true, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", true, null),
         new Property("Glacier2\\.Client\\.ACM", false, null),
         new Property("Glacier2\\.Client\\.AdapterId", false, null),
         new Property("Glacier2\\.Client\\.Endpoints", false, null),
@@ -691,11 +631,9 @@ public final class PropertyNames
         new Property("Glacier2\\.Client\\.Locator\\.Locator", false, null),
         new Property("Glacier2\\.Client\\.Locator\\.Router", false, null),
         new Property("Glacier2\\.Client\\.Locator\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.Client\\.Locator\\.CollocationOptimization", true, "Glacier2.Client.Locator.CollocationOptimized"),
         new Property("Glacier2\\.Client\\.Locator\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Client\\.Locator", false, null),
         new Property("Glacier2\\.Client\\.PublishedEndpoints", false, null),
-        new Property("Glacier2\\.Client\\.RegisterProcess", true, null),
         new Property("Glacier2\\.Client\\.ReplicaGroupId", false, null),
         new Property("Glacier2\\.Client\\.Router\\.EndpointSelection", false, null),
         new Property("Glacier2\\.Client\\.Router\\.ConnectionCached", false, null),
@@ -704,7 +642,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Client\\.Router\\.Locator", false, null),
         new Property("Glacier2\\.Client\\.Router\\.Router", false, null),
         new Property("Glacier2\\.Client\\.Router\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.Client\\.Router\\.CollocationOptimization", true, "Glacier2.Client.Router.CollocationOptimized"),
         new Property("Glacier2\\.Client\\.Router\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Client\\.Router", false, null),
         new Property("Glacier2\\.Client\\.ProxyOptions", false, null),
@@ -738,7 +675,6 @@ public final class PropertyNames
         new Property("Glacier2\\.PermissionsVerifier\\.Locator", false, null),
         new Property("Glacier2\\.PermissionsVerifier\\.Router", false, null),
         new Property("Glacier2\\.PermissionsVerifier\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.PermissionsVerifier\\.CollocationOptimization", true, "Glacier2.PermissionsVerifier.CollocationOptimized"),
         new Property("Glacier2\\.PermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.PermissionsVerifier", false, null),
         new Property("Glacier2\\.ReturnClientProxy", false, null),
@@ -749,7 +685,6 @@ public final class PropertyNames
         new Property("Glacier2\\.SSLPermissionsVerifier\\.Locator", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier\\.Router", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.SSLPermissionsVerifier\\.CollocationOptimization", true, "Glacier2.SSLPermissionsVerifier.CollocationOptimized"),
         new Property("Glacier2\\.SSLPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier", false, null),
         new Property("Glacier2\\.RoutingTable\\.MaxSize", false, null),
@@ -763,11 +698,9 @@ public final class PropertyNames
         new Property("Glacier2\\.Server\\.Locator\\.Locator", false, null),
         new Property("Glacier2\\.Server\\.Locator\\.Router", false, null),
         new Property("Glacier2\\.Server\\.Locator\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.Server\\.Locator\\.CollocationOptimization", true, "Glacier2.Server.Locator.CollocationOptimized"),
         new Property("Glacier2\\.Server\\.Locator\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Server\\.Locator", false, null),
         new Property("Glacier2\\.Server\\.PublishedEndpoints", false, null),
-        new Property("Glacier2\\.Server\\.RegisterProcess", true, null),
         new Property("Glacier2\\.Server\\.ReplicaGroupId", false, null),
         new Property("Glacier2\\.Server\\.Router\\.EndpointSelection", false, null),
         new Property("Glacier2\\.Server\\.Router\\.ConnectionCached", false, null),
@@ -776,7 +709,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Server\\.Router\\.Locator", false, null),
         new Property("Glacier2\\.Server\\.Router\\.Router", false, null),
         new Property("Glacier2\\.Server\\.Router\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.Server\\.Router\\.CollocationOptimization", true, "Glacier2.Server.Router.CollocationOptimized"),
         new Property("Glacier2\\.Server\\.Router\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Server\\.Router", false, null),
         new Property("Glacier2\\.Server\\.ProxyOptions", false, null),
@@ -800,7 +732,6 @@ public final class PropertyNames
         new Property("Glacier2\\.SessionManager\\.Locator", false, null),
         new Property("Glacier2\\.SessionManager\\.Router", false, null),
         new Property("Glacier2\\.SessionManager\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.SessionManager\\.CollocationOptimization", true, "Glacier2.SessionManager.CollocationOptimized"),
         new Property("Glacier2\\.SessionManager\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.SessionManager", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.EndpointSelection", false, null),
@@ -810,7 +741,6 @@ public final class PropertyNames
         new Property("Glacier2\\.SSLSessionManager\\.Locator", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.Router", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.EncodingVersion", false, null),
-        new Property("Glacier2\\.SSLSessionManager\\.CollocationOptimization", true, "Glacier2.SSLSessionManager.CollocationOptimized"),
         new Property("Glacier2\\.SSLSessionManager\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.SSLSessionManager", false, null),
         new Property("Glacier2\\.SessionTimeout", false, null),