zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Ice/PropertyNames.cpp

@@ -1,1389 +1,591 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Jan 22 11:21:15 2026
+
+// Copyright (c) ZeroC, Inc.
+
+// Generated by makeprops.py from PropertyNames.xml
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
-#include <Ice/PropertyNames.h>
+#include "PropertyNames.h"
 
-const IceInternal::Property IcePropsData[] =
+using namespace IceInternal;
+
+const Property ProxyPropsData[] =
 {
-    IceInternal::Property("Ice.AcceptClassCycles", false, 0),
-    IceInternal::Property("Ice.ACM.Timeout", false, 0),
-    IceInternal::Property("Ice.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Ice.ACM.Close", false, 0),
-    IceInternal::Property("Ice.ACM", false, 0),
-    IceInternal::Property("Ice.ACM.Client.Timeout", false, 0),
-    IceInternal::Property("Ice.ACM.Client.Heartbeat", false, 0),
-    IceInternal::Property("Ice.ACM.Client.Close", false, 0),
-    IceInternal::Property("Ice.ACM.Client", false, 0),
-    IceInternal::Property("Ice.ACM.Server.Timeout", false, 0),
-    IceInternal::Property("Ice.ACM.Server.Heartbeat", false, 0),
-    IceInternal::Property("Ice.ACM.Server.Close", false, 0),
-    IceInternal::Property("Ice.ACM.Server", false, 0),
-    IceInternal::Property("Ice.Admin.ACM.Timeout", false, 0),
-    IceInternal::Property("Ice.Admin.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Ice.Admin.ACM.Close", false, 0),
-    IceInternal::Property("Ice.Admin.ACM", false, 0),
-    IceInternal::Property("Ice.Admin.AdapterId", false, 0),
-    IceInternal::Property("Ice.Admin.Endpoints", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.Locator", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.Router", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.Context.*", false, 0),
-    IceInternal::Property("Ice.Admin.Locator", false, 0),
-    IceInternal::Property("Ice.Admin.PublishedEndpoints", false, 0),
-    IceInternal::Property("Ice.Admin.ReplicaGroupId", false, 0),
-    IceInternal::Property("Ice.Admin.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Admin.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Admin.Router.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Admin.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Router.Locator", false, 0),
-    IceInternal::Property("Ice.Admin.Router.Router", false, 0),
-    IceInternal::Property("Ice.Admin.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Admin.Router.Context.*", false, 0),
-    IceInternal::Property("Ice.Admin.Router", false, 0),
-    IceInternal::Property("Ice.Admin.ProxyOptions", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.Admin.MessageSizeMax", false, 0),
-    IceInternal::Property("Ice.Admin.DelayCreation", false, 0),
-    IceInternal::Property("Ice.Admin.Enabled", false, 0),
-    IceInternal::Property("Ice.Admin.Facets", false, 0),
-    IceInternal::Property("Ice.Admin.InstanceName", false, 0),
-    IceInternal::Property("Ice.Admin.Logger.KeepLogs", false, 0),
-    IceInternal::Property("Ice.Admin.Logger.KeepTraces", false, 0),
-    IceInternal::Property("Ice.Admin.Logger.Properties", false, 0),
-    IceInternal::Property("Ice.Admin.ServerId", false, 0),
-    IceInternal::Property("Ice.BackgroundLocatorCacheUpdates", false, 0),
-    IceInternal::Property("Ice.BatchAutoFlush", true, 0),
-    IceInternal::Property("Ice.BatchAutoFlushSize", false, 0),
-    IceInternal::Property("Ice.ChangeUser", false, 0),
-    IceInternal::Property("Ice.ClassGraphDepthMax", false, 0),
-    IceInternal::Property("Ice.ClientAccessPolicyProtocol", false, 0),
-    IceInternal::Property("Ice.Compression.Level", false, 0),
-    IceInternal::Property("Ice.CollectObjects", false, 0),
-    IceInternal::Property("Ice.Config", false, 0),
-    IceInternal::Property("Ice.ConsoleListener", false, 0),
-    IceInternal::Property("Ice.Default.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Default.EncodingVersion", false, 0),
-    IceInternal::Property("Ice.Default.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Host", false, 0),
-    IceInternal::Property("Ice.Default.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Default.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Locator", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Router", false, 0),
-    IceInternal::Property("Ice.Default.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Context.*", false, 0),
-    IceInternal::Property("Ice.Default.Locator", false, 0),
-    IceInternal::Property("Ice.Default.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Package", false, 0),
-    IceInternal::Property("Ice.Default.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Protocol", false, 0),
-    IceInternal::Property("Ice.Default.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Default.Router.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Router.Locator", false, 0),
-    IceInternal::Property("Ice.Default.Router.Router", false, 0),
-    IceInternal::Property("Ice.Default.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Default.Router.Context.*", false, 0),
-    IceInternal::Property("Ice.Default.Router", false, 0),
-    IceInternal::Property("Ice.Default.SlicedFormat", false, 0),
-    IceInternal::Property("Ice.Default.SourceAddress", false, 0),
-    IceInternal::Property("Ice.Default.Timeout", false, 0),
-    IceInternal::Property("Ice.EventLog.Source", false, 0),
-    IceInternal::Property("Ice.FactoryAssemblies", false, 0),
-    IceInternal::Property("Ice.HTTPProxyHost", false, 0),
-    IceInternal::Property("Ice.HTTPProxyPort", false, 0),
-    IceInternal::Property("Ice.ImplicitContext", false, 0),
-    IceInternal::Property("Ice.InitPlugins", false, 0),
-    IceInternal::Property("Ice.IPv4", false, 0),
-    IceInternal::Property("Ice.IPv6", false, 0),
-    IceInternal::Property("Ice.LogFile", false, 0),
-    IceInternal::Property("Ice.LogFile.SizeMax", false, 0),
-    IceInternal::Property("Ice.LogStdErr.Convert", false, 0),
-    IceInternal::Property("Ice.MessageSizeMax", false, 0),
-    IceInternal::Property("Ice.Nohup", false, 0),
-    IceInternal::Property("Ice.NullHandleAbort", false, 0),
-    IceInternal::Property("Ice.Override.CloseTimeout", false, 0),
-    IceInternal::Property("Ice.Override.Compress", false, 0),
-    IceInternal::Property("Ice.Override.ConnectTimeout", false, 0),
-    IceInternal::Property("Ice.Override.Timeout", false, 0),
-    IceInternal::Property("Ice.Override.Secure", false, 0),
-    IceInternal::Property("Ice.Package.*", false, 0),
-    IceInternal::Property("Ice.Plugin.*", false, 0),
-    IceInternal::Property("Ice.PluginLoadOrder", false, 0),
-    IceInternal::Property("Ice.PreferIPv6Address", false, 0),
-    IceInternal::Property("Ice.PreloadAssemblies", false, 0),
-    IceInternal::Property("Ice.PrintAdapterReady", false, 0),
-    IceInternal::Property("Ice.PrintProcessId", false, 0),
-    IceInternal::Property("Ice.PrintStackTraces", false, 0),
-    IceInternal::Property("Ice.ProgramName", false, 0),
-    IceInternal::Property("Ice.RetryIntervals", false, 0),
-    IceInternal::Property("Ice.ServerIdleTime", false, 0),
-    IceInternal::Property("Ice.SOCKSProxyHost", false, 0),
-    IceInternal::Property("Ice.SOCKSProxyPort", false, 0),
-    IceInternal::Property("Ice.StdErr", false, 0),
-    IceInternal::Property("Ice.StdOut", false, 0),
-    IceInternal::Property("Ice.SyslogFacility", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.Size", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.SizeMax", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.SizeWarn", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.StackSize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.Serialize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.ThreadIdleTime", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.Size", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.SizeMax", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.SizeWarn", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.StackSize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.Serialize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.ThreadIdleTime", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.ToStringMode", false, 0),
-    IceInternal::Property("Ice.Trace.Admin.Properties", false, 0),
-    IceInternal::Property("Ice.Trace.Admin.Logger", false, 0),
-    IceInternal::Property("Ice.Trace.Locator", false, 0),
-    IceInternal::Property("Ice.Trace.Network", false, 0),
-    IceInternal::Property("Ice.Trace.Protocol", false, 0),
-    IceInternal::Property("Ice.Trace.Retry", false, 0),
-    IceInternal::Property("Ice.Trace.Slicing", false, 0),
-    IceInternal::Property("Ice.Trace.ThreadPool", false, 0),
-    IceInternal::Property("Ice.UDP.RcvSize", false, 0),
-    IceInternal::Property("Ice.UDP.SndSize", false, 0),
-    IceInternal::Property("Ice.TCP.Backlog", false, 0),
-    IceInternal::Property("Ice.TCP.RcvSize", false, 0),
-    IceInternal::Property("Ice.TCP.SndSize", false, 0),
-    IceInternal::Property("Ice.UseApplicationClassLoader", false, 0),
-    IceInternal::Property("Ice.UseOSLog", false, 0),
-    IceInternal::Property("Ice.UseSyslog", false, 0),
-    IceInternal::Property("Ice.UseSystemdJournal", false, 0),
-    IceInternal::Property("Ice.Warn.AMICallback", false, 0),
-    IceInternal::Property("Ice.Warn.Connections", false, 0),
-    IceInternal::Property("Ice.Warn.Datagrams", false, 0),
-    IceInternal::Property("Ice.Warn.Dispatch", false, 0),
-    IceInternal::Property("Ice.Warn.Endpoints", false, 0),
-    IceInternal::Property("Ice.Warn.UnknownProperties", false, 0),
-    IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
-    IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
-    IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
+    Property{"CollocationOptimized", "", false, false, nullptr},
+    Property{"ConnectionCached", "", false, false, nullptr},
+    Property{"Context.*", "", true, false, nullptr},
+    Property{"EndpointSelection", "", false, false, nullptr},
+    Property{"InvocationTimeout", "", false, false, nullptr},
+    Property{"Locator", "", false, false, &PropertyNames::ProxyProps},
+    Property{"LocatorCacheTimeout", "", false, false, nullptr},
+    Property{"Router", "", false, false, &PropertyNames::ProxyProps}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceProps(IcePropsData,
-                                                sizeof(IcePropsData)/sizeof(IcePropsData[0]));
+const PropertyArray PropertyNames::ProxyProps
+{
+    .name="Proxy",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=ProxyPropsData,
+    .length=8
+};
 
-const IceInternal::Property IceMXPropsData[] =
+const Property ConnectionPropsData[] =
 {
-    IceInternal::Property("IceMX.Metrics.*.GroupBy", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.Map", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.RetainDetached", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.Accept", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.Reject", false, 0),
-    IceInternal::Property("IceMX.Metrics.*", false, 0),
+    Property{"CloseTimeout", "10", false, false, nullptr},
+    Property{"ConnectTimeout", "10", false, false, nullptr},
+    Property{"EnableIdleCheck", "1", false, false, nullptr},
+    Property{"IdleTimeout", "60", false, false, nullptr},
+    Property{"InactivityTimeout", "300", false, false, nullptr},
+    Property{"MaxDispatches", "100", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceMXProps(IceMXPropsData,
-                                                sizeof(IceMXPropsData)/sizeof(IceMXPropsData[0]));
+const PropertyArray PropertyNames::ConnectionProps
+{
+    .name="Connection",
+    .prefixOnly=true,
+    .isOptIn=false,
+    .properties=ConnectionPropsData,
+    .length=6
+};
 
-const IceInternal::Property IceDiscoveryPropsData[] =
+const Property ThreadPoolPropsData[] =
 {
-    IceInternal::Property("IceDiscovery.Multicast.ACM.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ACM.Close", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ACM", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.AdapterId", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Endpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ProxyOptions", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.MessageSizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Lookup", false, 0),
-    IceInternal::Property("IceDiscovery.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.RetryCount", false, 0),
-    IceInternal::Property("IceDiscovery.LatencyMultiplier", false, 0),
-    IceInternal::Property("IceDiscovery.Address", false, 0),
-    IceInternal::Property("IceDiscovery.Port", false, 0),
-    IceInternal::Property("IceDiscovery.Interface", false, 0),
-    IceInternal::Property("IceDiscovery.DomainId", false, 0),
+    Property{"Serialize", "0", false, false, nullptr},
+    Property{"Size", "1", false, false, nullptr},
+    Property{"SizeMax", "", false, false, nullptr},
+    Property{"SizeWarn", "0", false, false, nullptr},
+    Property{"ThreadIdleTime", "60", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceDiscoveryProps(IceDiscoveryPropsData,
-                                                sizeof(IceDiscoveryPropsData)/sizeof(IceDiscoveryPropsData[0]));
+const PropertyArray PropertyNames::ThreadPoolProps
+{
+    .name="ThreadPool",
+    .prefixOnly=true,
+    .isOptIn=false,
+    .properties=ThreadPoolPropsData,
+    .length=5
+};
 
-const IceInternal::Property IceLocatorDiscoveryPropsData[] =
+const Property ObjectAdapterPropsData[] =
 {
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Lookup", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Timeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.RetryCount", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.RetryDelay", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Address", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Port", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Interface", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.InstanceName", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Trace.Lookup", false, 0),
+    Property{"AdapterId", "", false, false, nullptr},
+    Property{"Connection", "", false, false, &PropertyNames::ConnectionProps},
+    Property{"Endpoints", "", false, false, nullptr},
+    Property{"Locator", "", false, false, &PropertyNames::ProxyProps},
+    Property{"MaxConnections", "0", false, false, nullptr},
+    Property{"MessageSizeMax", "", false, false, nullptr},
+    Property{"ProxyOptions", "", false, false, nullptr},
+    Property{"PublishedEndpoints", "", false, false, nullptr},
+    Property{"PublishedHost", "", false, false, nullptr},
+    Property{"ReplicaGroupId", "", false, false, nullptr},
+    Property{"Router", "", false, false, &PropertyNames::ProxyProps},
+    Property{"ThreadPool", "", false, false, &PropertyNames::ThreadPoolProps}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceLocatorDiscoveryProps(IceLocatorDiscoveryPropsData,
-                                                sizeof(IceLocatorDiscoveryPropsData)/sizeof(IceLocatorDiscoveryPropsData[0]));
+const PropertyArray PropertyNames::ObjectAdapterProps
+{
+    .name="ObjectAdapter",
+    .prefixOnly=true,
+    .isOptIn=false,
+    .properties=ObjectAdapterPropsData,
+    .length=12
+};
 
-const IceInternal::Property IceBoxPropsData[] =
+const Property IcePropsData[] =
 {
-    IceInternal::Property("IceBox.InheritProperties", false, 0),
-    IceInternal::Property("IceBox.InstanceName", true, 0),
-    IceInternal::Property("IceBox.LoadOrder", false, 0),
-    IceInternal::Property("IceBox.PrintServicesReady", false, 0),
-    IceInternal::Property("IceBox.Service.*", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.AdapterId", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.Endpoints", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", true, 0),
-    IceInternal::Property("IceBox.Trace.ServiceObserver", false, 0),
-    IceInternal::Property("IceBox.UseSharedCommunicator.*", false, 0),
+    Property{"AcceptClassCycles", "0", false, false, nullptr},
+    Property{"Admin", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Admin.DelayCreation", "0", false, false, nullptr},
+    Property{"Admin.Enabled", "", false, false, nullptr},
+    Property{"Admin.Facets", "", false, false, nullptr},
+    Property{"Admin.InstanceName", "", false, false, nullptr},
+    Property{"Admin.Logger.KeepLogs", "100", false, false, nullptr},
+    Property{"Admin.Logger.KeepTraces", "100", false, false, nullptr},
+    Property{"Admin.Logger.Properties", "", false, false, nullptr},
+    Property{"Admin.ServerId", "", false, false, nullptr},
+    Property{"BackgroundLocatorCacheUpdates", "0", false, false, nullptr},
+    Property{"BatchAutoFlushSize", "1024", false, false, nullptr},
+    Property{"ClassGraphDepthMax", "10", false, false, nullptr},
+    Property{"Compression.Level", "1", false, false, nullptr},
+    Property{"Config", "", false, false, nullptr},
+    Property{"Connection.Client", "", false, false, &PropertyNames::ConnectionProps},
+    Property{"Connection.Server", "", false, false, &PropertyNames::ConnectionProps},
+    Property{"Default.CollocationOptimized", "1", false, false, nullptr},
+    Property{"Default.EncodingVersion", "1.1", false, false, nullptr},
+    Property{"Default.EndpointSelection", "Random", false, false, nullptr},
+    Property{"Default.Host", "", false, false, nullptr},
+    Property{"Default.InvocationTimeout", "-1", false, false, nullptr},
+    Property{"Default.Locator", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Default.LocatorCacheTimeout", "-1", false, false, nullptr},
+    Property{"Default.Protocol", "tcp", false, false, nullptr},
+    Property{"Default.Router", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Default.SlicedFormat", "0", false, false, nullptr},
+    Property{"Default.SourceAddress", "", false, false, nullptr},
+    Property{"EventLog.Source", "", false, false, nullptr},
+    Property{"HTTPProxyHost", "", false, false, nullptr},
+    Property{"HTTPProxyPort", "1080", false, false, nullptr},
+    Property{"ImplicitContext", "None", false, false, nullptr},
+    Property{"InitPlugins", "1", false, false, nullptr},
+    Property{"IPv4", "1", false, false, nullptr},
+    Property{"IPv6", "1", false, false, nullptr},
+    Property{"LogFile", "", false, false, nullptr},
+    Property{"LogFile.SizeMax", "0", false, false, nullptr},
+    Property{"LogStdErr.Convert", "1", false, false, nullptr},
+    Property{"MessageSizeMax", "1024", false, false, nullptr},
+    Property{"Nohup", "1", false, false, nullptr},
+    Property{"Override.Compress", "", false, false, nullptr},
+    Property{"Plugin.*", "", true, false, nullptr},
+    Property{"PluginLoadOrder", "", false, false, nullptr},
+    Property{"PreferIPv6Address", "0", false, false, nullptr},
+    Property{"PrintAdapterReady", "", false, false, nullptr},
+    Property{"PrintProcessId", "", false, false, nullptr},
+    Property{"PrintStackTraces", "0", false, false, nullptr},
+    Property{"ProgramName", "", false, false, nullptr},
+    Property{"RetryIntervals", "0", false, false, nullptr},
+    Property{"ServerIdleTime", "0", false, false, nullptr},
+    Property{"SliceLoader.NotFoundCacheSize", "100", false, false, nullptr},
+    Property{"SOCKSProxyHost", "", false, false, nullptr},
+    Property{"SOCKSProxyPort", "1080", false, false, nullptr},
+    Property{"StdErr", "", false, false, nullptr},
+    Property{"StdOut", "", false, false, nullptr},
+    Property{"SyslogFacility", "LOG_USER", false, false, nullptr},
+    Property{"TCP.Backlog", "511", false, false, nullptr},
+    Property{"TCP.RcvSize", "", false, false, nullptr},
+    Property{"TCP.SndSize", "", false, false, nullptr},
+    Property{"ThreadPool.Client", "", false, false, &PropertyNames::ThreadPoolProps},
+    Property{"ThreadPool.Server", "", false, false, &PropertyNames::ThreadPoolProps},
+    Property{"ToStringMode", "Unicode", false, false, nullptr},
+    Property{"Trace.Admin.Logger", "0", false, false, nullptr},
+    Property{"Trace.Admin.Properties", "0", false, false, nullptr},
+    Property{"Trace.Dispatch", "0", false, false, nullptr},
+    Property{"Trace.Locator", "0", false, false, nullptr},
+    Property{"Trace.Network", "0", false, false, nullptr},
+    Property{"Trace.Protocol", "0", false, false, nullptr},
+    Property{"Trace.Retry", "0", false, false, nullptr},
+    Property{"Trace.Slicing", "0", false, false, nullptr},
+    Property{"Trace.ThreadPool", "0", false, false, nullptr},
+    Property{"UDP.RcvSize", "", false, false, nullptr},
+    Property{"UDP.SndSize", "", false, false, nullptr},
+    Property{"UseOSLog", "0", false, false, nullptr},
+    Property{"UseSyslog", "0", false, false, nullptr},
+    Property{"UseSystemdJournal", "0", false, false, nullptr},
+    Property{"Warn.AMICallback", "1", false, false, nullptr},
+    Property{"Warn.Connections", "0", false, false, nullptr},
+    Property{"Warn.Datagrams", "0", false, false, nullptr},
+    Property{"Warn.Dispatch", "1", false, false, nullptr},
+    Property{"Warn.Endpoints", "1", false, false, nullptr},
+    Property{"Warn.Executor", "1", false, false, nullptr},
+    Property{"Warn.SliceLoader", "1", false, false, nullptr},
+    Property{"Warn.UnusedProperties", "0", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData,
-                                                sizeof(IceBoxPropsData)/sizeof(IceBoxPropsData[0]));
+const PropertyArray PropertyNames::IceProps
+{
+    .name="Ice",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=IcePropsData,
+    .length=84
+};
 
-const IceInternal::Property IceBoxAdminPropsData[] =
+const Property IceMXPropsData[] =
 {
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EndpointSelection", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ConnectionCached", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.PreferSecure", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Locator", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Router", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Context.*", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy", false, 0),
+    Property{"Metrics.*", "", true, false, nullptr},
+    Property{"Metrics.*.Accept", "", true, false, nullptr},
+    Property{"Metrics.*.GroupBy", "", true, false, nullptr},
+    Property{"Metrics.*.Map", "", true, false, nullptr},
+    Property{"Metrics.*.Reject", "", true, false, nullptr},
+    Property{"Metrics.*.RetainDetached", "10", true, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceBoxAdminProps(IceBoxAdminPropsData,
-                                                sizeof(IceBoxAdminPropsData)/sizeof(IceBoxAdminPropsData[0]));
+const PropertyArray PropertyNames::IceMXProps
+{
+    .name="IceMX",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=IceMXPropsData,
+    .length=6
+};
 
-const IceInternal::Property IceBridgePropsData[] =
+const Property IceDiscoveryPropsData[] =
 {
-    IceInternal::Property("IceBridge.Source.ACM.Timeout", false, 0),
-    IceInternal::Property("IceBridge.Source.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceBridge.Source.ACM.Close", false, 0),
-    IceInternal::Property("IceBridge.Source.ACM", false, 0),
-    IceInternal::Property("IceBridge.Source.AdapterId", false, 0),
-    IceInternal::Property("IceBridge.Source.Endpoints", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.Locator", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.Router", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.Context.*", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator", false, 0),
-    IceInternal::Property("IceBridge.Source.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceBridge.Source.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.Locator", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.Router", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.Context.*", false, 0),
-    IceInternal::Property("IceBridge.Source.Router", false, 0),
-    IceInternal::Property("IceBridge.Source.ProxyOptions", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceBridge.Source.MessageSizeMax", false, 0),
-    IceInternal::Property("IceBridge.Target.Endpoints", false, 0),
-    IceInternal::Property("IceBridge.InstanceName", false, 0),
+    Property{"Address", "", false, false, nullptr},
+    Property{"DomainId", "", false, false, nullptr},
+    Property{"Interface", "", false, false, nullptr},
+    Property{"LatencyMultiplier", "1", false, false, nullptr},
+    Property{"Locator", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Lookup", "", false, false, nullptr},
+    Property{"Multicast", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Port", "4061", false, false, nullptr},
+    Property{"Reply", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"RetryCount", "3", false, false, nullptr},
+    Property{"Timeout", "300", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceBridgeProps(IceBridgePropsData,
-                                                sizeof(IceBridgePropsData)/sizeof(IceBridgePropsData[0]));
+const PropertyArray PropertyNames::IceDiscoveryProps
+{
+    .name="IceDiscovery",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=IceDiscoveryPropsData,
+    .length=11
+};
 
-const IceInternal::Property IceGridAdminPropsData[] =
+const Property IceLocatorDiscoveryPropsData[] =
 {
-    IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
-    IceInternal::Property("IceGridAdmin.MetricsConfig", false, 0),
-    IceInternal::Property("IceGridAdmin.Username", false, 0),
-    IceInternal::Property("IceGridAdmin.Password", false, 0),
-    IceInternal::Property("IceGridAdmin.Replica", false, 0),
-    IceInternal::Property("IceGridAdmin.Host", false, 0),
-    IceInternal::Property("IceGridAdmin.Port", false, 0),
-    IceInternal::Property("IceGridAdmin.InstanceName", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM.Close", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.AdapterId", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Endpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Address", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Interface", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Lookup", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Trace.Observers", false, 0),
-    IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", false, 0),
+    Property{"Address", "", false, false, nullptr},
+    Property{"InstanceName", "", false, false, nullptr},
+    Property{"Interface", "", false, false, nullptr},
+    Property{"Locator", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Lookup", "", false, false, nullptr},
+    Property{"Port", "4061", false, false, nullptr},
+    Property{"Reply", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"RetryCount", "3", false, false, nullptr},
+    Property{"RetryDelay", "2000", false, false, nullptr},
+    Property{"Timeout", "300", false, false, nullptr},
+    Property{"Trace.Lookup", "0", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceGridAdminProps(IceGridAdminPropsData,
-                                                sizeof(IceGridAdminPropsData)/sizeof(IceGridAdminPropsData[0]));
+const PropertyArray PropertyNames::IceLocatorDiscoveryProps
+{
+    .name="IceLocatorDiscovery",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=IceLocatorDiscoveryPropsData,
+    .length=11
+};
 
-const IceInternal::Property IceGridPropsData[] =
+const Property IceBoxPropsData[] =
 {
-    IceInternal::Property("IceGrid.AdminRouter.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ACM", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.InstanceName", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM", false, 0),
-    IceInternal::Property("IceGrid.Node.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Node.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Node.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Node.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Node.AllowRunningServersAsRoot", false, 0),
-    IceInternal::Property("IceGrid.Node.AllowEndpointsOverride", false, 0),
-    IceInternal::Property("IceGrid.Node.CollocateRegistry", false, 0),
-    IceInternal::Property("IceGrid.Node.Data", false, 0),
-    IceInternal::Property("IceGrid.Node.DisableOnFailure", false, 0),
-    IceInternal::Property("IceGrid.Node.Name", false, 0),
-    IceInternal::Property("IceGrid.Node.Output", false, 0),
-    IceInternal::Property("IceGrid.Node.ProcessorSocketCount", false, 0),
-    IceInternal::Property("IceGrid.Node.PrintServersReady", false, 0),
-    IceInternal::Property("IceGrid.Node.PropertiesOverride", false, 0),
-    IceInternal::Property("IceGrid.Node.RedirectErrToOut", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Activator", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Adapter", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Admin", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Patch", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Replica", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Server", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccounts", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper", false, 0),
-    IceInternal::Property("IceGrid.Node.WaitTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminCryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionFilters", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.PublishedEndpoints", false, 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),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.PublishedEndpoints", false, 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),
-    IceInternal::Property("IceGrid.Registry.Client.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.DefaultTemplates", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Enabled", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Address", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Port", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Interface", false, 0),
-    IceInternal::Property("IceGrid.Registry.DynamicRegistration", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", false, 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),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.LMDB.MapSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.LMDB.Path", false, 0),
-    IceInternal::Property("IceGrid.Registry.NodeSessionTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
-    IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
-    IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", false, 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),
-    IceInternal::Property("IceGrid.Registry.Server.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionFilters", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.PublishedEndpoints", false, 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),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Admin", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Adapter", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Discovery", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Node", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Object", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Patch", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Replica", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Server", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Session", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Subscriber", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Topic", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.TopicManager", false, 0),
-    IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
+    Property{"InheritProperties", "", false, false, nullptr},
+    Property{"LoadOrder", "", false, false, nullptr},
+    Property{"PrintServicesReady", "", false, false, nullptr},
+    Property{"Service.*", "", true, false, nullptr},
+    Property{"Trace.ServiceObserver", "", false, false, nullptr},
+    Property{"UseSharedCommunicator.*", "", true, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceGridProps(IceGridPropsData,
-                                                sizeof(IceGridPropsData)/sizeof(IceGridPropsData[0]));
+const PropertyArray PropertyNames::IceBoxProps
+{
+    .name="IceBox",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceBoxPropsData,
+    .length=6
+};
 
-const IceInternal::Property IcePatch2PropsData[] =
+const Property IceBoxAdminPropsData[] =
 {
-    IceInternal::Property("IcePatch2.ACM.Timeout", false, 0),
-    IceInternal::Property("IcePatch2.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IcePatch2.ACM.Close", false, 0),
-    IceInternal::Property("IcePatch2.ACM", false, 0),
-    IceInternal::Property("IcePatch2.AdapterId", false, 0),
-    IceInternal::Property("IcePatch2.Endpoints", false, 0),
-    IceInternal::Property("IcePatch2.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IcePatch2.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IcePatch2.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IcePatch2.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IcePatch2.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IcePatch2.Locator.Locator", false, 0),
-    IceInternal::Property("IcePatch2.Locator.Router", false, 0),
-    IceInternal::Property("IcePatch2.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IcePatch2.Locator.Context.*", false, 0),
-    IceInternal::Property("IcePatch2.Locator", false, 0),
-    IceInternal::Property("IcePatch2.PublishedEndpoints", false, 0),
-    IceInternal::Property("IcePatch2.ReplicaGroupId", false, 0),
-    IceInternal::Property("IcePatch2.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IcePatch2.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IcePatch2.Router.PreferSecure", false, 0),
-    IceInternal::Property("IcePatch2.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IcePatch2.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IcePatch2.Router.Locator", false, 0),
-    IceInternal::Property("IcePatch2.Router.Router", false, 0),
-    IceInternal::Property("IcePatch2.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IcePatch2.Router.Context.*", false, 0),
-    IceInternal::Property("IcePatch2.Router", false, 0),
-    IceInternal::Property("IcePatch2.ProxyOptions", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.Size", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IcePatch2.MessageSizeMax", false, 0),
-    IceInternal::Property("IcePatch2.Directory", false, 0),
-    IceInternal::Property("IcePatch2.InstanceName", false, 0),
+    Property{"ServiceManager.Proxy", "", false, false, &PropertyNames::ProxyProps}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IcePatch2Props(IcePatch2PropsData,
-                                                sizeof(IcePatch2PropsData)/sizeof(IcePatch2PropsData[0]));
+const PropertyArray PropertyNames::IceBoxAdminProps
+{
+    .name="IceBoxAdmin",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceBoxAdminPropsData,
+    .length=1
+};
 
-const IceInternal::Property IcePatch2ClientPropsData[] =
+const Property IceBridgePropsData[] =
 {
-    IceInternal::Property("IcePatch2Client.ChunkSize", false, 0),
-    IceInternal::Property("IcePatch2Client.Directory", false, 0),
-    IceInternal::Property("IcePatch2Client.Proxy", false, 0),
-    IceInternal::Property("IcePatch2Client.Remove", false, 0),
-    IceInternal::Property("IcePatch2Client.Thorough", false, 0),
+    Property{"Source", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Target.Endpoints", "", false, false, nullptr},
+    Property{"InstanceName", "IceBridge", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IcePatch2ClientProps(IcePatch2ClientPropsData,
-                                                sizeof(IcePatch2ClientPropsData)/sizeof(IcePatch2ClientPropsData[0]));
+const PropertyArray PropertyNames::IceBridgeProps
+{
+    .name="IceBridge",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceBridgePropsData,
+    .length=3
+};
 
-const IceInternal::Property IceSSLPropsData[] =
+const Property IceGridAdminPropsData[] =
 {
-    IceInternal::Property("IceSSL.Alias", false, 0),
-    IceInternal::Property("IceSSL.CAs", false, 0),
-    IceInternal::Property("IceSSL.CertAuthDir", true, "IceSSL.CAs"),
-    IceInternal::Property("IceSSL.CertAuthFile", true, "IceSSL.CAs"),
-    IceInternal::Property("IceSSL.CertStore", false, 0),
-    IceInternal::Property("IceSSL.CertStoreLocation", false, 0),
-    IceInternal::Property("IceSSL.CertFile", false, 0),
-    IceInternal::Property("IceSSL.CertVerifier", false, 0),
-    IceInternal::Property("IceSSL.CheckCertName", false, 0),
-    IceInternal::Property("IceSSL.CheckCRL", false, 0),
-    IceInternal::Property("IceSSL.Ciphers", false, 0),
-    IceInternal::Property("IceSSL.CertificateRevocationListFiles", false, 0),
-    IceInternal::Property("IceSSL.DefaultDir", false, 0),
-    IceInternal::Property("IceSSL.DH.*", false, 0),
-    IceInternal::Property("IceSSL.DHParams", false, 0),
-    IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
-    IceInternal::Property("IceSSL.FindCert", false, 0),
-    IceInternal::Property("IceSSL.FindCert.*", true, 0),
-    IceInternal::Property("IceSSL.InitOpenSSL", false, 0),
-    IceInternal::Property("IceSSL.KeyFile", false, 0),
-    IceInternal::Property("IceSSL.Keychain", false, 0),
-    IceInternal::Property("IceSSL.KeychainPassword", false, 0),
-    IceInternal::Property("IceSSL.Keystore", false, 0),
-    IceInternal::Property("IceSSL.KeystorePassword", false, 0),
-    IceInternal::Property("IceSSL.KeystoreType", false, 0),
-    IceInternal::Property("IceSSL.Password", false, 0),
-    IceInternal::Property("IceSSL.PasswordCallback", false, 0),
-    IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
-    IceInternal::Property("IceSSL.Protocols", false, 0),
-    IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0),
-    IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0),
-    IceInternal::Property("IceSSL.Random", false, 0),
-    IceInternal::Property("IceSSL.RevocationCheck", false, 0),
-    IceInternal::Property("IceSSL.RevocationCheckCacheOnly", false, 0),
-    IceInternal::Property("IceSSL.SchannelStrongCrypto", false, 0),
-    IceInternal::Property("IceSSL.SecurityLevel", false, 0),
-    IceInternal::Property("IceSSL.Trace.Security", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Client", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Server", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Server.*", false, 0),
-    IceInternal::Property("IceSSL.Truststore", false, 0),
-    IceInternal::Property("IceSSL.TruststorePassword", false, 0),
-    IceInternal::Property("IceSSL.TruststoreType", false, 0),
-    IceInternal::Property("IceSSL.UsePlatformCAs", false, 0),
-    IceInternal::Property("IceSSL.VerifyDepthMax", false, 0),
-    IceInternal::Property("IceSSL.VerifyPeer", false, 0),
+    Property{"AuthenticateUsingSSL", "", false, false, nullptr},
+    Property{"Discovery.Address", "", false, false, nullptr},
+    Property{"Discovery.Interface", "", false, false, nullptr},
+    Property{"Discovery.Locator", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Discovery.Lookup", "", false, false, nullptr},
+    Property{"Discovery.Reply", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Host", "", false, false, nullptr},
+    Property{"InstanceName", "", false, false, nullptr},
+    Property{"Password", "", false, false, nullptr},
+    Property{"Port", "", false, false, nullptr},
+    Property{"Replica", "", false, false, nullptr},
+    Property{"Server", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Username", "", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceSSLProps(IceSSLPropsData,
-                                                sizeof(IceSSLPropsData)/sizeof(IceSSLPropsData[0]));
+const PropertyArray PropertyNames::IceGridAdminProps
+{
+    .name="IceGridAdmin",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceGridAdminPropsData,
+    .length=13
+};
 
-const IceInternal::Property IceStormAdminPropsData[] =
+const Property IceGridPropsData[] =
 {
-    IceInternal::Property("IceStormAdmin.TopicManager.*", false, 0),
-    IceInternal::Property("IceStormAdmin.Host", false, 0),
-    IceInternal::Property("IceStormAdmin.Port", false, 0),
+    Property{"InstanceName", "", false, false, nullptr},
+    Property{"Node", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Node.AllowEndpointsOverride", "0", false, false, nullptr},
+    Property{"Node.AllowRunningServersAsRoot", "", false, false, nullptr},
+    Property{"Node.CollocateRegistry", "", false, false, nullptr},
+    Property{"Node.Data", "", false, false, nullptr},
+    Property{"Node.DisableOnFailure", "0", false, false, nullptr},
+    Property{"Node.Name", "", false, false, nullptr},
+    Property{"Node.Output", "", false, false, nullptr},
+    Property{"Node.PrintServersReady", "", false, false, nullptr},
+    Property{"Node.ProcessorSocketCount", "", false, false, nullptr},
+    Property{"Node.PropertiesOverride", "", false, false, nullptr},
+    Property{"Node.RedirectErrToOut", "0", false, false, nullptr},
+    Property{"Node.Trace.Activator", "0", false, false, nullptr},
+    Property{"Node.Trace.Adapter", "0", false, false, nullptr},
+    Property{"Node.Trace.Admin", "0", false, false, nullptr},
+    Property{"Node.Trace.Replica", "0", false, false, nullptr},
+    Property{"Node.Trace.Server", "0", false, false, nullptr},
+    Property{"Node.UserAccountMapper", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Node.UserAccounts", "", false, false, nullptr},
+    Property{"Node.WaitTime", "60", false, false, nullptr},
+    Property{"Registry.AdminCryptPasswords", "", false, false, nullptr},
+    Property{"Registry.AdminPermissionsVerifier", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Registry.AdminSessionFilters", "0", false, false, nullptr},
+    Property{"Registry.AdminSessionManager", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Registry.AdminSSLPermissionsVerifier", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Registry.Client", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Registry.CryptPasswords", "", false, false, nullptr},
+    Property{"Registry.DefaultTemplates", "", false, false, nullptr},
+    Property{"Registry.Discovery", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Registry.Discovery.Address", "", false, false, nullptr},
+    Property{"Registry.Discovery.Enabled", "1", false, false, nullptr},
+    Property{"Registry.Discovery.Interface", "", false, false, nullptr},
+    Property{"Registry.Discovery.Port", "4061", false, false, nullptr},
+    Property{"Registry.DynamicRegistration", "", false, false, nullptr},
+    Property{"Registry.Internal", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Registry.LMDB.Path", "", false, false, nullptr},
+    Property{"Registry.LMDB.MapSize", "", false, false, nullptr},
+    Property{"Registry.NodeSessionTimeout", "30", false, false, nullptr},
+    Property{"Registry.PermissionsVerifier", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Registry.ReplicaName", "Master", false, false, nullptr},
+    Property{"Registry.ReplicaSessionTimeout", "30", false, false, nullptr},
+    Property{"Registry.Server", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Registry.SessionFilters", "0", false, false, nullptr},
+    Property{"Registry.SessionManager", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Registry.SSLPermissionsVerifier", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Registry.Trace.Adapter", "0", false, false, nullptr},
+    Property{"Registry.Trace.Admin", "0", false, false, nullptr},
+    Property{"Registry.Trace.Application", "0", false, false, nullptr},
+    Property{"Registry.Trace.Discovery", "0", false, false, nullptr},
+    Property{"Registry.Trace.Locator", "0", false, false, nullptr},
+    Property{"Registry.Trace.Node", "0", false, false, nullptr},
+    Property{"Registry.Trace.Object", "0", false, false, nullptr},
+    Property{"Registry.Trace.Replica", "0", false, false, nullptr},
+    Property{"Registry.Trace.Server", "0", false, false, nullptr},
+    Property{"Registry.Trace.Session", "0", false, false, nullptr},
+    Property{"Registry.Trace.Subscriber", "0", false, false, nullptr},
+    Property{"Registry.Trace.Topic", "0", false, false, nullptr},
+    Property{"Registry.Trace.TopicManager", "0", false, false, nullptr},
+    Property{"Registry.UserAccounts", "", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
-                                                sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
+const PropertyArray PropertyNames::IceGridProps
+{
+    .name="IceGrid",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceGridPropsData,
+    .length=60
+};
 
-const IceInternal::Property IceBTPropsData[] =
+const PropertyArray PropertyNames::IceGridGUIProps
 {
-    IceInternal::Property("IceBT.RcvSize", false, 0),
-    IceInternal::Property("IceBT.SndSize", false, 0),
+    .name="IceGridGUI",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=nullptr,
+    .length=0
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceBTProps(IceBTPropsData,
-                                                sizeof(IceBTPropsData)/sizeof(IceBTPropsData[0]));
+const Property IceSSLPropsData[] =
+{
+    Property{"CAs", "", false, false, nullptr},
+    Property{"CertFile", "", false, false, nullptr},
+    Property{"CertificateRevocationListFiles", "", false, false, nullptr},
+    Property{"CertStore", "My", false, false, nullptr},
+    Property{"CertStoreLocation", "CurrentUser", false, false, nullptr},
+    Property{"CheckCertName", "0", false, false, nullptr},
+    Property{"DefaultDir", "", false, false, nullptr},
+    Property{"FindCert", "", false, false, nullptr},
+    Property{"Keychain", "", false, false, nullptr},
+    Property{"KeychainPassword", "", false, false, nullptr},
+    Property{"KeyFile", "", false, false, nullptr},
+    Property{"Password", "", false, false, nullptr},
+    Property{"RevocationCheck", "0", false, false, nullptr},
+    Property{"RevocationCheckCacheOnly", "1", false, false, nullptr},
+    Property{"Trace.Security", "0", false, false, nullptr},
+    Property{"TrustOnly", "", false, false, nullptr},
+    Property{"TrustOnly.Client", "", false, false, nullptr},
+    Property{"TrustOnly.Server", "", false, false, nullptr},
+    Property{"TrustOnly.Server.*", "", true, false, nullptr},
+    Property{"UsePlatformCAs", "0", false, false, nullptr},
+    Property{"VerifyPeer", "2", false, false, nullptr}
+};
 
-const IceInternal::Property Glacier2PropsData[] =
+const PropertyArray PropertyNames::IceSSLProps
 {
-    IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM.Timeout", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM.Close", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM", false, 0),
-    IceInternal::Property("Glacier2.Client.AdapterId", false, 0),
-    IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.Locator", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.Router", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator", false, 0),
-    IceInternal::Property("Glacier2.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Client.ReplicaGroupId", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.Locator", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.Router", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Client.Router", false, 0),
-    IceInternal::Property("Glacier2.Client.ProxyOptions", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.Size", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("Glacier2.Client.MessageSizeMax", false, 0),
-    IceInternal::Property("Glacier2.Client.AlwaysBatch", false, 0),
-    IceInternal::Property("Glacier2.Client.Buffered", false, 0),
-    IceInternal::Property("Glacier2.Client.ForwardContext", false, 0),
-    IceInternal::Property("Glacier2.Client.SleepTime", false, 0),
-    IceInternal::Property("Glacier2.Client.Trace.Override", false, 0),
-    IceInternal::Property("Glacier2.Client.Trace.Reject", false, 0),
-    IceInternal::Property("Glacier2.Client.Trace.Request", false, 0),
-    IceInternal::Property("Glacier2.CryptPasswords", false, 0),
-    IceInternal::Property("Glacier2.Filter.Address.Reject", false, 0),
-    IceInternal::Property("Glacier2.Filter.Address.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.ProxySizeMax", false, 0),
-    IceInternal::Property("Glacier2.Filter.Category.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.Category.AcceptUser", false, 0),
-    IceInternal::Property("Glacier2.Filter.AdapterId.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.Identity.Accept", false, 0),
-    IceInternal::Property("Glacier2.InstanceName", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Router", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2.ReturnClientProxy", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2.RoutingTable.MaxSize", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM.Timeout", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM.Close", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM", false, 0),
-    IceInternal::Property("Glacier2.Server.AdapterId", false, 0),
-    IceInternal::Property("Glacier2.Server.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.Locator", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.Router", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator", false, 0),
-    IceInternal::Property("Glacier2.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Server.ReplicaGroupId", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.Locator", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.Router", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Server.Router", false, 0),
-    IceInternal::Property("Glacier2.Server.ProxyOptions", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("Glacier2.Server.MessageSizeMax", false, 0),
-    IceInternal::Property("Glacier2.Server.AlwaysBatch", false, 0),
-    IceInternal::Property("Glacier2.Server.Buffered", false, 0),
-    IceInternal::Property("Glacier2.Server.ForwardContext", false, 0),
-    IceInternal::Property("Glacier2.Server.SleepTime", false, 0),
-    IceInternal::Property("Glacier2.Server.Trace.Override", false, 0),
-    IceInternal::Property("Glacier2.Server.Trace.Request", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Locator", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Router", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Context.*", false, 0),
-    IceInternal::Property("Glacier2.SessionManager", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Locator", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Router", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Context.*", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager", false, 0),
-    IceInternal::Property("Glacier2.SessionTimeout", false, 0),
-    IceInternal::Property("Glacier2.Trace.RoutingTable", false, 0),
-    IceInternal::Property("Glacier2.Trace.Session", false, 0),
+    .name="IceSSL",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=IceSSLPropsData,
+    .length=21
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::Glacier2Props(Glacier2PropsData,
-                                                sizeof(Glacier2PropsData)/sizeof(Glacier2PropsData[0]));
+const Property IceStormPropsData[] =
+{
+    Property{"Discard.Interval", "60", false, false, nullptr},
+    Property{"Election.ElectionTimeout", "10", false, false, nullptr},
+    Property{"Election.MasterTimeout", "10", false, false, nullptr},
+    Property{"Election.ResponseTimeout", "10", false, false, nullptr},
+    Property{"Flush.Timeout", "1000", false, false, nullptr},
+    Property{"InstanceName", "IceStorm", false, false, nullptr},
+    Property{"LMDB.Path", "IceStorm", false, false, nullptr},
+    Property{"LMDB.MapSize", "", false, false, nullptr},
+    Property{"Node", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"NodeId", "-1", false, false, nullptr},
+    Property{"Nodes.*", "", true, false, nullptr},
+    Property{"Publish", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"ReplicatedPublishEndpoints", "", false, false, nullptr},
+    Property{"ReplicatedTopicManagerEndpoints", "", false, false, nullptr},
+    Property{"Send.QueueSizeMax", "-1", false, false, nullptr},
+    Property{"Send.QueueSizeMaxPolicy", "", false, false, nullptr},
+    Property{"Send.Timeout", "60000", false, false, nullptr},
+    Property{"TopicManager", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"TopicManager.Proxy", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Trace.Election", "0", false, false, nullptr},
+    Property{"Trace.Replication", "0", false, false, nullptr},
+    Property{"Trace.Subscriber", "0", false, false, nullptr},
+    Property{"Trace.Topic", "0", false, false, nullptr},
+    Property{"Trace.TopicManager", "0", false, false, nullptr},
+    Property{"Transient", "0", false, false, nullptr}
+};
+
+const PropertyArray PropertyNames::IceStormProps
+{
+    .name="IceStorm",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceStormPropsData,
+    .length=25
+};
 
-const IceInternal::Property Glacier2CryptPermissionsVerifierPropsData[] =
+const Property IceStormAdminPropsData[] =
 {
-    IceInternal::Property("Glacier2CryptPermissionsVerifier.*.PermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2CryptPermissionsVerifier.*.AdminPermissionsVerifier", false, 0),
+    Property{"Host", "", false, false, nullptr},
+    Property{"Port", "", false, false, nullptr},
+    Property{"TopicManager.*", "", true, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::Glacier2CryptPermissionsVerifierProps(Glacier2CryptPermissionsVerifierPropsData,
-                                                sizeof(Glacier2CryptPermissionsVerifierPropsData)/sizeof(Glacier2CryptPermissionsVerifierPropsData[0]));
+const PropertyArray PropertyNames::IceStormAdminProps
+{
+    .name="IceStormAdmin",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=IceStormAdminPropsData,
+    .length=3
+};
 
-const IceInternal::Property FreezePropsData[] =
+const Property IceBTPropsData[] =
 {
-    IceInternal::Property("Freeze.DbEnv.*.CheckpointPeriod", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.DbHome", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.DbPrivate", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.DbRecoverFatal", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.EncodingVersion", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.LockFile", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.OldLogsAutoDelete", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.PeriodicCheckpointMinSize", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.BtreeMinKey", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.Checksum", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.MaxTxSize", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.PageSize", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.PopulateEmptyIndices", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.RollbackOnUserException", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.SavePeriod", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.SaveSizeTrigger", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.StreamTimeout", false, 0),
-    IceInternal::Property("Freeze.Map.*.BtreeMinKey", false, 0),
-    IceInternal::Property("Freeze.Map.*.Checksum", false, 0),
-    IceInternal::Property("Freeze.Map.*.PageSize", false, 0),
-    IceInternal::Property("Freeze.Trace.DbEnv", false, 0),
-    IceInternal::Property("Freeze.Trace.Evictor", false, 0),
-    IceInternal::Property("Freeze.Trace.Map", false, 0),
-    IceInternal::Property("Freeze.Trace.Transaction", false, 0),
-    IceInternal::Property("Freeze.Warn.Deadlocks", false, 0),
-    IceInternal::Property("Freeze.Warn.Rollback", false, 0),
+    Property{"RcvSize", "", false, false, nullptr},
+    Property{"SndSize", "", false, false, nullptr}
 };
 
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::FreezeProps(FreezePropsData,
-                                                sizeof(FreezePropsData)/sizeof(FreezePropsData[0]));
+const PropertyArray PropertyNames::IceBTProps
+{
+    .name="IceBT",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=IceBTPropsData,
+    .length=2
+};
 
-const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
+const Property Glacier2PropsData[] =
+{
+    Property{"AddConnectionContext", "0", false, false, nullptr},
+    Property{"Client", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Client.ForwardContext", "0", false, false, nullptr},
+    Property{"Client.Trace.Reject", "0", false, false, nullptr},
+    Property{"Client.Trace.Request", "0", false, false, nullptr},
+    Property{"CryptPasswords", "", false, false, nullptr},
+    Property{"Filter.AdapterId.Accept", "", false, false, nullptr},
+    Property{"Filter.Address.Accept", "", false, false, nullptr},
+    Property{"Filter.Address.Reject", "", false, false, nullptr},
+    Property{"Filter.Category.Accept", "", false, false, nullptr},
+    Property{"Filter.Category.AcceptUser", "", false, false, nullptr},
+    Property{"Filter.Identity.Accept", "", false, false, nullptr},
+    Property{"Filter.ProxySizeMax", "", false, false, nullptr},
+    Property{"InstanceName", "Glacier2", false, false, nullptr},
+    Property{"PermissionsVerifier", "", false, false, &PropertyNames::ProxyProps},
+    Property{"RoutingTable.MaxSize", "1000", false, false, nullptr},
+    Property{"Server", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Server.ForwardContext", "0", false, false, nullptr},
+    Property{"Server.Trace.Request", "0", false, false, nullptr},
+    Property{"SessionManager", "", false, false, &PropertyNames::ProxyProps},
+    Property{"SSLPermissionsVerifier", "", false, false, &PropertyNames::ProxyProps},
+    Property{"SSLSessionManager", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Trace.RoutingTable", "0", false, false, nullptr},
+    Property{"Trace.Session", "0", false, false, nullptr}
+};
+
+const PropertyArray PropertyNames::Glacier2Props
+{
+    .name="Glacier2",
+    .prefixOnly=false,
+    .isOptIn=true,
+    .properties=Glacier2PropsData,
+    .length=24
+};
+
+const Property DataStormPropsData[] =
+{
+    Property{"Node.ConnectTo", "", false, false, nullptr},
+    Property{"Node.Multicast", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Node.Multicast.Enabled", "1", false, false, nullptr},
+    Property{"Node.Multicast.Proxy", "", false, false, &PropertyNames::ProxyProps},
+    Property{"Node.Name", "", false, false, nullptr},
+    Property{"Node.RetryCount", "6", false, false, nullptr},
+    Property{"Node.RetryDelay", "500", false, false, nullptr},
+    Property{"Node.RetryMultiplier", "2", false, false, nullptr},
+    Property{"Node.Server", "", false, false, &PropertyNames::ObjectAdapterProps},
+    Property{"Node.Server.Enabled", "1", false, false, nullptr},
+    Property{"Node.Server.ForwardDiscoveryToMulticast", "0", false, false, nullptr},
+    Property{"Topic.ClearHistory", "OnAll", false, false, nullptr},
+    Property{"Topic.DiscardPolicy", "Never", false, false, nullptr},
+    Property{"Topic.Priority", "0", false, false, nullptr},
+    Property{"Topic.SampleCount", "-1", false, false, nullptr},
+    Property{"Topic.SampleLifetime", "0", false, false, nullptr},
+    Property{"Trace.Data", "0", false, false, nullptr},
+    Property{"Trace.Session", "0", false, false, nullptr},
+    Property{"Trace.Topic", "0", false, false, nullptr}
+};
+
+const PropertyArray PropertyNames::DataStormProps
+{
+    .name="DataStorm",
+    .prefixOnly=false,
+    .isOptIn=false,
+    .properties=DataStormPropsData,
+    .length=19
+};
+
+const std::array<PropertyArray, 16> PropertyNames::validProps =
 {
     IceProps,
     IceMXProps,
@@ -1394,35 +596,11 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IceBridgeProps,
     IceGridAdminProps,
     IceGridProps,
-    IcePatch2Props,
-    IcePatch2ClientProps,
+    IceGridGUIProps,
     IceSSLProps,
+    IceStormProps,
     IceStormAdminProps,
     IceBTProps,
     Glacier2Props,
-    Glacier2CryptPermissionsVerifierProps,
-    FreezeProps,
-    IceInternal::PropertyArray(0,0)
-};
-
-const char* IceInternal::PropertyNames::clPropNames[] =
-{
-    "Ice",
-    "IceMX",
-    "IceDiscovery",
-    "IceLocatorDiscovery",
-    "IceBox",
-    "IceBoxAdmin",
-    "IceBridge",
-    "IceGridAdmin",
-    "IceGrid",
-    "IcePatch2",
-    "IcePatch2Client",
-    "IceSSL",
-    "IceStormAdmin",
-    "IceBT",
-    "Glacier2",
-    "Glacier2CryptPermissionsVerifier",
-    "Freeze",
-    0
+    DataStormProps
 };