zeroc-ice 3.6.3 → 3.6.4

data/ext/ice/cpp/src/Ice/PluginManagerI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/Process.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/ProcessF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/Properties.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertiesAdminI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertiesF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PropertiesI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertiesI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,18 +1,18 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 20 10:36:23 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Aug 16 16:59:11 2017
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
 #include <Ice/PropertyNames.h>
 
-const IceInternal::Property IcePropsData[] = 
+const IceInternal::Property IcePropsData[] =
 {
     IceInternal::Property("Ice.ACM.Client", true, 0),
     IceInternal::Property("Ice.ACM.Server", true, 0),
@@ -77,6 +77,7 @@ const IceInternal::Property IcePropsData[] =
     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),
@@ -194,7 +195,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceProps(IcePropsData,
                                                 sizeof(IcePropsData)/sizeof(IcePropsData[0]));
 
-const IceInternal::Property IceMXPropsData[] = 
+const IceInternal::Property IceMXPropsData[] =
 {
     IceInternal::Property("IceMX.Metrics.*.GroupBy", false, 0),
     IceInternal::Property("IceMX.Metrics.*.Map", false, 0),
@@ -208,7 +209,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceMXProps(IceMXPropsData,
                                                 sizeof(IceMXPropsData)/sizeof(IceMXPropsData[0]));
 
-const IceInternal::Property IceDiscoveryPropsData[] = 
+const IceInternal::Property IceDiscoveryPropsData[] =
 {
     IceInternal::Property("IceDiscovery.Multicast.ACM.Timeout", false, 0),
     IceInternal::Property("IceDiscovery.Multicast.ACM.Heartbeat", false, 0),
@@ -335,97 +336,97 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceDiscoveryProps(IceDiscoveryPropsData,
                                                 sizeof(IceDiscoveryPropsData)/sizeof(IceDiscoveryPropsData[0]));
 
-const IceInternal::Property IceGridDiscoveryPropsData[] = 
+const IceInternal::Property IceLocatorDiscoveryPropsData[] =
 {
-    IceInternal::Property("IceGridDiscovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Lookup", false, 0),
-    IceInternal::Property("IceGridDiscovery.Timeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.RetryCount", false, 0),
-    IceInternal::Property("IceGridDiscovery.RetryDelay", false, 0),
-    IceInternal::Property("IceGridDiscovery.Address", false, 0),
-    IceInternal::Property("IceGridDiscovery.Port", false, 0),
-    IceInternal::Property("IceGridDiscovery.Interface", false, 0),
-    IceInternal::Property("IceGridDiscovery.InstanceName", false, 0),
+    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),
 };
 
 const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceGridDiscoveryProps(IceGridDiscoveryPropsData,
-                                                sizeof(IceGridDiscoveryPropsData)/sizeof(IceGridDiscoveryPropsData[0]));
+    IceInternal::PropertyNames::IceLocatorDiscoveryProps(IceLocatorDiscoveryPropsData,
+                                                sizeof(IceLocatorDiscoveryPropsData)/sizeof(IceLocatorDiscoveryPropsData[0]));
 
-const IceInternal::Property IceBoxPropsData[] = 
+const IceInternal::Property IceBoxPropsData[] =
 {
     IceInternal::Property("IceBox.InheritProperties", false, 0),
     IceInternal::Property("IceBox.InstanceName", true, 0),
@@ -450,7 +451,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData,
                                                 sizeof(IceBoxPropsData)/sizeof(IceBoxPropsData[0]));
 
-const IceInternal::Property IceBoxAdminPropsData[] = 
+const IceInternal::Property IceBoxAdminPropsData[] =
 {
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EndpointSelection", false, 0),
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ConnectionCached", false, 0),
@@ -468,7 +469,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxAdminProps(IceBoxAdminPropsData,
                                                 sizeof(IceBoxAdminPropsData)/sizeof(IceBoxAdminPropsData[0]));
 
-const IceInternal::Property IceGridAdminPropsData[] = 
+const IceInternal::Property IceGridAdminPropsData[] =
 {
     IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
     IceInternal::Property("IceGridAdmin.MetricsConfig", false, 0),
@@ -526,7 +527,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceGridAdminProps(IceGridAdminPropsData,
                                                 sizeof(IceGridAdminPropsData)/sizeof(IceGridAdminPropsData[0]));
 
-const IceInternal::Property IceGridPropsData[] = 
+const IceInternal::Property IceGridPropsData[] =
 {
     IceInternal::Property("IceGrid.AdminRouter.ACM.Timeout", false, 0),
     IceInternal::Property("IceGrid.AdminRouter.ACM.Heartbeat", false, 0),
@@ -936,7 +937,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceGridProps(IceGridPropsData,
                                                 sizeof(IceGridPropsData)/sizeof(IceGridPropsData[0]));
 
-const IceInternal::Property IcePatch2PropsData[] = 
+const IceInternal::Property IcePatch2PropsData[] =
 {
     IceInternal::Property("IcePatch2.ACM.Timeout", false, 0),
     IceInternal::Property("IcePatch2.ACM.Heartbeat", false, 0),
@@ -983,7 +984,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IcePatch2Props(IcePatch2PropsData,
                                                 sizeof(IcePatch2PropsData)/sizeof(IcePatch2PropsData[0]));
 
-const IceInternal::Property IcePatch2ClientPropsData[] = 
+const IceInternal::Property IcePatch2ClientPropsData[] =
 {
     IceInternal::Property("IcePatch2Client.ChunkSize", false, 0),
     IceInternal::Property("IcePatch2Client.Directory", false, 0),
@@ -996,7 +997,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IcePatch2ClientProps(IcePatch2ClientPropsData,
                                                 sizeof(IcePatch2ClientPropsData)/sizeof(IcePatch2ClientPropsData[0]));
 
-const IceInternal::Property IceSSLPropsData[] = 
+const IceInternal::Property IceSSLPropsData[] =
 {
     IceInternal::Property("IceSSL.Alias", false, 0),
     IceInternal::Property("IceSSL.CAs", false, 0),
@@ -1049,7 +1050,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceSSLProps(IceSSLPropsData,
                                                 sizeof(IceSSLPropsData)/sizeof(IceSSLPropsData[0]));
 
-const IceInternal::Property IceStormAdminPropsData[] = 
+const IceInternal::Property IceStormAdminPropsData[] =
 {
     IceInternal::Property("IceStormAdmin.TopicManager.*", false, 0),
     IceInternal::Property("IceStormAdmin.Host", false, 0),
@@ -1060,7 +1061,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
                                                 sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
 
-const IceInternal::Property Glacier2PropsData[] = 
+const IceInternal::Property Glacier2PropsData[] =
 {
     IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
     IceInternal::Property("Glacier2.Client.ACM.Timeout", false, 0),
@@ -1210,7 +1211,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::Glacier2Props(Glacier2PropsData,
                                                 sizeof(Glacier2PropsData)/sizeof(Glacier2PropsData[0]));
 
-const IceInternal::Property Glacier2CryptPermissionsVerifierPropsData[] = 
+const IceInternal::Property Glacier2CryptPermissionsVerifierPropsData[] =
 {
     IceInternal::Property("Glacier2CryptPermissionsVerifier.*.PermissionsVerifier", false, 0),
     IceInternal::Property("Glacier2CryptPermissionsVerifier.*.AdminPermissionsVerifier", false, 0),
@@ -1220,7 +1221,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::Glacier2CryptPermissionsVerifierProps(Glacier2CryptPermissionsVerifierPropsData,
                                                 sizeof(Glacier2CryptPermissionsVerifierPropsData)/sizeof(Glacier2CryptPermissionsVerifierPropsData[0]));
 
-const IceInternal::Property FreezePropsData[] = 
+const IceInternal::Property FreezePropsData[] =
 {
     IceInternal::Property("Freeze.DbEnv.*.CheckpointPeriod", false, 0),
     IceInternal::Property("Freeze.DbEnv.*.DbHome", false, 0),
@@ -1254,13 +1255,12 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::FreezeProps(FreezePropsData,
                                                 sizeof(FreezePropsData)/sizeof(FreezePropsData[0]));
 
-
 const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
 {
     IceProps,
     IceMXProps,
     IceDiscoveryProps,
-    IceGridDiscoveryProps,
+    IceLocatorDiscoveryProps,
     IceBoxProps,
     IceBoxAdminProps,
     IceGridAdminProps,
@@ -1275,13 +1275,12 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IceInternal::PropertyArray(0,0)
 };
 
-
 const char* IceInternal::PropertyNames::clPropNames[] =
 {
     "Ice",
     "IceMX",
     "IceDiscovery",
-    "IceGridDiscovery",
+    "IceLocatorDiscovery",
     "IceBox",
     "IceBoxAdmin",
     "IceGridAdmin",
@@ -1295,4 +1294,3 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "Freeze",
     0
 };
-