Fixed ICE-4861 Review deprecated APIs

2 files changed, 2 insertions, 72 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index c53761bfc81..e9e05239474 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -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!
 
@@ -28,11 +28,9 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Admin.Locator.Locator", false, 0),
     IceInternal::Property("Ice.Admin.Locator.Router", false, 0),
     IceInternal::Property("Ice.Admin.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.CollocationOptimization", true, "Ice.Admin.Locator.CollocationOptimized"),
     IceInternal::Property("Ice.Admin.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("Ice.Admin.Locator", false, 0),
     IceInternal::Property("Ice.Admin.PublishedEndpoints", false, 0),
-    IceInternal::Property("Ice.Admin.RegisterProcess", true, 0),
     IceInternal::Property("Ice.Admin.ReplicaGroupId", false, 0),
     IceInternal::Property("Ice.Admin.Router.EndpointSelection", false, 0),
     IceInternal::Property("Ice.Admin.Router.ConnectionCached", false, 0),
@@ -41,7 +39,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Admin.Router.Locator", false, 0),
     IceInternal::Property("Ice.Admin.Router.Router", false, 0),
     IceInternal::Property("Ice.Admin.Router.EncodingVersion", false, 0),
-    IceInternal::Property("Ice.Admin.Router.CollocationOptimization", true, "Ice.Admin.Router.CollocationOptimized"),
     IceInternal::Property("Ice.Admin.Router.CollocationOptimized", false, 0),
     IceInternal::Property("Ice.Admin.Router", false, 0),
     IceInternal::Property("Ice.Admin.ProxyOptions", false, 0),
@@ -62,7 +59,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Compression.Level", false, 0),
     IceInternal::Property("Ice.Config", false, 0),
     IceInternal::Property("Ice.ConsoleListener", false, 0),
-    IceInternal::Property("Ice.Default.CollocationOptimization", true, "Ice.Default.CollocationOptimized"),
     IceInternal::Property("Ice.Default.CollocationOptimized", false, 0),
     IceInternal::Property("Ice.Default.EncodingVersion", false, 0),
     IceInternal::Property("Ice.Default.EndpointSelection", false, 0),
@@ -74,7 +70,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Default.Locator.Locator", false, 0),
     IceInternal::Property("Ice.Default.Locator.Router", false, 0),
     IceInternal::Property("Ice.Default.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("Ice.Default.Locator.CollocationOptimization", true, "Ice.Default.Locator.CollocationOptimized"),
     IceInternal::Property("Ice.Default.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("Ice.Default.Locator", false, 0),
     IceInternal::Property("Ice.Default.LocatorCacheTimeout", false, 0),
@@ -88,7 +83,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Default.Router.Locator", false, 0),
     IceInternal::Property("Ice.Default.Router.Router", false, 0),
     IceInternal::Property("Ice.Default.Router.EncodingVersion", false, 0),
-    IceInternal::Property("Ice.Default.Router.CollocationOptimization", true, "Ice.Default.Router.CollocationOptimized"),
     IceInternal::Property("Ice.Default.Router.CollocationOptimized", false, 0),
     IceInternal::Property("Ice.Default.Router", false, 0),
     IceInternal::Property("Ice.Default.SlicedFormat", false, 0),
@@ -117,7 +111,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.PrintStackTraces", false, 0),
     IceInternal::Property("Ice.ProgramName", false, 0),
     IceInternal::Property("Ice.RetryIntervals", false, 0),
-    IceInternal::Property("Ice.ServerId", true, 0),
     IceInternal::Property("Ice.ServerIdleTime", false, 0),
     IceInternal::Property("Ice.StdErr", false, 0),
     IceInternal::Property("Ice.StdOut", false, 0),
@@ -139,7 +132,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.ThreadPriority", false, 0),
     IceInternal::Property("Ice.Trace.Admin.Properties", false, 0),
     IceInternal::Property("Ice.Trace.GC", false, 0),
-    IceInternal::Property("Ice.Trace.Location", true, "Ice.Trace.Locator"),
     IceInternal::Property("Ice.Trace.Locator", false, 0),
     IceInternal::Property("Ice.Trace.Network", false, 0),
     IceInternal::Property("Ice.Trace.Protocol", false, 0),
@@ -197,11 +189,9 @@ const IceInternal::Property IceBoxPropsData[] =
     IceInternal::Property("IceBox.ServiceManager.Locator.Locator", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Locator.Router", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.CollocationOptimization", true, "IceBox.ServiceManager.Locator.CollocationOptimized"),
     IceInternal::Property("IceBox.ServiceManager.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Locator", false, 0),
     IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.RegisterProcess", true, 0),
     IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Router.ConnectionCached", false, 0),
@@ -210,7 +200,6 @@ const IceInternal::Property IceBoxPropsData[] =
     IceInternal::Property("IceBox.ServiceManager.Router.Locator", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Router.Router", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.CollocationOptimization", true, "IceBox.ServiceManager.Router.CollocationOptimized"),
     IceInternal::Property("IceBox.ServiceManager.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Router", false, 0),
     IceInternal::Property("IceBox.ServiceManager.ProxyOptions", false, 0),
@@ -238,7 +227,6 @@ const IceInternal::Property IceBoxAdminPropsData[] =
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Locator", false, 0),
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Router", false, 0),
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EncodingVersion", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimization", true, "IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized"),
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized", false, 0),
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy", false, 0),
 };
@@ -274,11 +262,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Node.Locator.Locator", false, 0),
     IceInternal::Property("IceGrid.Node.Locator.Router", false, 0),
     IceInternal::Property("IceGrid.Node.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.CollocationOptimization", true, "IceGrid.Node.Locator.CollocationOptimized"),
     IceInternal::Property("IceGrid.Node.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Node.Locator", false, 0),
     IceInternal::Property("IceGrid.Node.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Node.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Node.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Node.Router.ConnectionCached", false, 0),
@@ -287,7 +273,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Node.Router.Locator", false, 0),
     IceInternal::Property("IceGrid.Node.Router.Router", false, 0),
     IceInternal::Property("IceGrid.Node.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.CollocationOptimization", true, "IceGrid.Node.Router.CollocationOptimized"),
     IceInternal::Property("IceGrid.Node.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Node.Router", false, 0),
     IceInternal::Property("IceGrid.Node.ProxyOptions", false, 0),
@@ -322,7 +307,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", false, 0),
     IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", false, 0),
     IceInternal::Property("IceGrid.Node.UserAccountMapper.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimization", true, "IceGrid.Node.UserAccountMapper.CollocationOptimized"),
     IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Node.UserAccountMapper", false, 0),
     IceInternal::Property("IceGrid.Node.WaitTime", false, 0),
@@ -334,7 +318,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimization", true, "IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionFilters", false, 0),
@@ -348,11 +331,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimization", true, "IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.ConnectionCached", false, 0),
@@ -361,7 +342,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.CollocationOptimization", true, "IceGrid.Registry.AdminSessionManager.Router.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSessionManager.ProxyOptions", false, 0),
@@ -379,7 +359,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization", true, "IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.ACM", false, 0),
@@ -392,11 +371,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Client.Locator.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Locator.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.CollocationOptimization", true, "IceGrid.Registry.Client.Locator.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.Client.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.Client.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Router.ConnectionCached", false, 0),
@@ -405,7 +382,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Client.Router.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Router.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.CollocationOptimization", true, "IceGrid.Registry.Client.Router.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.Client.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.ProxyOptions", false, 0),
@@ -430,11 +406,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Internal.Locator.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Locator.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.CollocationOptimization", true, "IceGrid.Registry.Internal.Locator.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.Internal.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Router.ConnectionCached", false, 0),
@@ -443,7 +417,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Internal.Router.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Router.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.CollocationOptimization", true, "IceGrid.Registry.Internal.Router.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.Internal.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ProxyOptions", false, 0),
@@ -462,7 +435,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimization", true, "IceGrid.Registry.PermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
@@ -479,11 +451,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Server.Locator.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Locator.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.CollocationOptimization", true, "IceGrid.Registry.Server.Locator.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.Server.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.Server.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Router.ConnectionCached", false, 0),
@@ -492,7 +462,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Server.Router.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Router.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.CollocationOptimization", true, "IceGrid.Registry.Server.Router.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.Server.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.ProxyOptions", false, 0),
@@ -514,11 +483,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.CollocationOptimization", true, "IceGrid.Registry.SessionManager.Locator.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.SessionManager.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router.ConnectionCached", false, 0),
@@ -527,7 +494,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.SessionManager.Router.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.CollocationOptimization", true, "IceGrid.Registry.SessionManager.Router.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.ProxyOptions", false, 0),
@@ -546,7 +512,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimization", true, "IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
@@ -587,11 +552,9 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.Locator.Locator", false, 0),
     IceInternal::Property("IcePatch2.Locator.Router", false, 0),
     IceInternal::Property("IcePatch2.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("IcePatch2.Locator.CollocationOptimization", true, "IcePatch2.Locator.CollocationOptimized"),
     IceInternal::Property("IcePatch2.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("IcePatch2.Locator", false, 0),
     IceInternal::Property("IcePatch2.PublishedEndpoints", false, 0),
-    IceInternal::Property("IcePatch2.RegisterProcess", true, 0),
     IceInternal::Property("IcePatch2.ReplicaGroupId", false, 0),
     IceInternal::Property("IcePatch2.Router.EndpointSelection", false, 0),
     IceInternal::Property("IcePatch2.Router.ConnectionCached", false, 0),
@@ -600,7 +563,6 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.Router.Locator", false, 0),
     IceInternal::Property("IcePatch2.Router.Router", false, 0),
     IceInternal::Property("IcePatch2.Router.EncodingVersion", false, 0),
-    IceInternal::Property("IcePatch2.Router.CollocationOptimization", true, "IcePatch2.Router.CollocationOptimized"),
     IceInternal::Property("IcePatch2.Router.CollocationOptimized", false, 0),
     IceInternal::Property("IcePatch2.Router", false, 0),
     IceInternal::Property("IcePatch2.ProxyOptions", false, 0),
@@ -611,17 +573,6 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.ThreadPool.Serialize", false, 0),
     IceInternal::Property("IcePatch2.ThreadPool.ThreadIdleTime", false, 0),
     IceInternal::Property("IcePatch2.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IcePatch2.Admin.AdapterId", true, 0),
-    IceInternal::Property("IcePatch2.Admin.Endpoints", true, 0),
-    IceInternal::Property("IcePatch2.Admin.Locator", true, 0),
-    IceInternal::Property("IcePatch2.Admin.PublishedEndpoints", true, 0),
-    IceInternal::Property("IcePatch2.Admin.RegisterProcess", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ReplicaGroupId", true, 0),
-    IceInternal::Property("IcePatch2.Admin.Router", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", true, 0),
     IceInternal::Property("IcePatch2.ChunkSize", false, 0),
     IceInternal::Property("IcePatch2.Directory", false, 0),
     IceInternal::Property("IcePatch2.InstanceName", false, 0),
@@ -698,17 +649,6 @@ const IceInternal::Property Glacier2PropsData[] =
 {
     IceInternal::Property("Glacier2.AddSSLContext", true, 0),
     IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
-    IceInternal::Property("Glacier2.Admin.AdapterId", true, 0),
-    IceInternal::Property("Glacier2.Admin.Endpoints", true, 0),
-    IceInternal::Property("Glacier2.Admin.Locator", true, 0),
-    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", true, 0),
-    IceInternal::Property("Glacier2.Admin.RegisterProcess", true, 0),
-    IceInternal::Property("Glacier2.Admin.ReplicaGroupId", true, 0),
-    IceInternal::Property("Glacier2.Admin.Router", true, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.Size", true, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeMax", true, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeWarn", true, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.StackSize", true, 0),
     IceInternal::Property("Glacier2.Client.ACM", false, 0),
     IceInternal::Property("Glacier2.Client.AdapterId", false, 0),
     IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
@@ -719,11 +659,9 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.Client.Locator.Locator", false, 0),
     IceInternal::Property("Glacier2.Client.Locator.Router", false, 0),
     IceInternal::Property("Glacier2.Client.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.CollocationOptimization", true, "Glacier2.Client.Locator.CollocationOptimized"),
     IceInternal::Property("Glacier2.Client.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.Client.Locator", false, 0),
     IceInternal::Property("Glacier2.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Client.RegisterProcess", true, 0),
     IceInternal::Property("Glacier2.Client.ReplicaGroupId", false, 0),
     IceInternal::Property("Glacier2.Client.Router.EndpointSelection", false, 0),
     IceInternal::Property("Glacier2.Client.Router.ConnectionCached", false, 0),
@@ -732,7 +670,6 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.Client.Router.Locator", false, 0),
     IceInternal::Property("Glacier2.Client.Router.Router", false, 0),
     IceInternal::Property("Glacier2.Client.Router.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.CollocationOptimization", true, "Glacier2.Client.Router.CollocationOptimized"),
     IceInternal::Property("Glacier2.Client.Router.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.Client.Router", false, 0),
     IceInternal::Property("Glacier2.Client.ProxyOptions", false, 0),
@@ -766,7 +703,6 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.PermissionsVerifier.Locator", false, 0),
     IceInternal::Property("Glacier2.PermissionsVerifier.Router", false, 0),
     IceInternal::Property("Glacier2.PermissionsVerifier.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimization", true, "Glacier2.PermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.PermissionsVerifier", false, 0),
     IceInternal::Property("Glacier2.ReturnClientProxy", false, 0),
@@ -777,7 +713,6 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", false, 0),
     IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", false, 0),
     IceInternal::Property("Glacier2.SSLPermissionsVerifier.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimization", true, "Glacier2.SSLPermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0),
     IceInternal::Property("Glacier2.RoutingTable.MaxSize", false, 0),
@@ -791,11 +726,9 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.Server.Locator.Locator", false, 0),
     IceInternal::Property("Glacier2.Server.Locator.Router", false, 0),
     IceInternal::Property("Glacier2.Server.Locator.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.CollocationOptimization", true, "Glacier2.Server.Locator.CollocationOptimized"),
     IceInternal::Property("Glacier2.Server.Locator.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.Server.Locator", false, 0),
     IceInternal::Property("Glacier2.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Server.RegisterProcess", true, 0),
     IceInternal::Property("Glacier2.Server.ReplicaGroupId", false, 0),
     IceInternal::Property("Glacier2.Server.Router.EndpointSelection", false, 0),
     IceInternal::Property("Glacier2.Server.Router.ConnectionCached", false, 0),
@@ -804,7 +737,6 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.Server.Router.Locator", false, 0),
     IceInternal::Property("Glacier2.Server.Router.Router", false, 0),
     IceInternal::Property("Glacier2.Server.Router.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.CollocationOptimization", true, "Glacier2.Server.Router.CollocationOptimized"),
     IceInternal::Property("Glacier2.Server.Router.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.Server.Router", false, 0),
     IceInternal::Property("Glacier2.Server.ProxyOptions", false, 0),
@@ -828,7 +760,6 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.SessionManager.Locator", false, 0),
     IceInternal::Property("Glacier2.SessionManager.Router", false, 0),
     IceInternal::Property("Glacier2.SessionManager.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.CollocationOptimization", true, "Glacier2.SessionManager.CollocationOptimized"),
     IceInternal::Property("Glacier2.SessionManager.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.SessionManager", false, 0),
     IceInternal::Property("Glacier2.SSLSessionManager.EndpointSelection", false, 0),
@@ -838,7 +769,6 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.SSLSessionManager.Locator", false, 0),
     IceInternal::Property("Glacier2.SSLSessionManager.Router", false, 0),
     IceInternal::Property("Glacier2.SSLSessionManager.EncodingVersion", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimization", true, "Glacier2.SSLSessionManager.CollocationOptimized"),
     IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimized", false, 0),
     IceInternal::Property("Glacier2.SSLSessionManager", false, 0),
     IceInternal::Property("Glacier2.SessionTimeout", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 977663dcee7..9a58ee47ab7 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -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!