1 files changed, 86 insertions, 86 deletions
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index f5a9a6b8fb8..8cece16a6fe 100644
--- a/csharp/src/Ice/PropertyNames.cs
+++ b/csharp/src/Ice/PropertyNames.cs
@@ -6,7 +6,7 @@
 // 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 Nov  2 09:46:48 2016
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -328,90 +328,90 @@ namespace IceInternal
              null
         };
 
-        public static Property[] IceGridDiscoveryProps =
+        public static Property[] IceLocatorDiscoveryProps =
         {
-             new Property(@"^IceGridDiscovery\.Reply\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ACM\.Close$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ACM$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.AdapterId$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Endpoints$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.Router$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Locator$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.Locator$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.Router$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.Router$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ProxyOptions$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGridDiscovery\.Reply\.MessageSizeMax$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ACM\.Close$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ACM$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.AdapterId$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Endpoints$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.Router$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.Locator$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.Router$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.Router$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ProxyOptions$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGridDiscovery\.Locator\.MessageSizeMax$", false, null),
-             new Property(@"^IceGridDiscovery\.Lookup$", false, null),
-             new Property(@"^IceGridDiscovery\.Timeout$", false, null),
-             new Property(@"^IceGridDiscovery\.RetryCount$", false, null),
-             new Property(@"^IceGridDiscovery\.RetryDelay$", false, null),
-             new Property(@"^IceGridDiscovery\.Address$", false, null),
-             new Property(@"^IceGridDiscovery\.Port$", false, null),
-             new Property(@"^IceGridDiscovery\.Interface$", false, null),
-             new Property(@"^IceGridDiscovery\.InstanceName$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Timeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Heartbeat$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Close$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ACM$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.AdapterId$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Endpoints$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.EndpointSelection$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.ConnectionCached$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.PreferSecure$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.LocatorCacheTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.InvocationTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Locator$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Router$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.CollocationOptimized$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Context\.[^\s]+$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Locator$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.PublishedEndpoints$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ReplicaGroupId$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.EndpointSelection$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.ConnectionCached$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.PreferSecure$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.LocatorCacheTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.InvocationTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Locator$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Router$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.CollocationOptimized$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Context\.[^\s]+$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.Router$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ProxyOptions$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.Size$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.SizeMax$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.SizeWarn$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.StackSize$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.Serialize$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.ThreadIdleTime$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.ThreadPriority$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Reply\.MessageSizeMax$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Timeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Heartbeat$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Close$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ACM$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.AdapterId$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Endpoints$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.EndpointSelection$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.ConnectionCached$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.PreferSecure$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.LocatorCacheTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.InvocationTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Locator$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Router$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.CollocationOptimized$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Context\.[^\s]+$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Locator$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.PublishedEndpoints$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ReplicaGroupId$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.EndpointSelection$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.ConnectionCached$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.PreferSecure$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.LocatorCacheTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.InvocationTimeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Locator$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Router$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.CollocationOptimized$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Context\.[^\s]+$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.Router$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ProxyOptions$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.Size$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.SizeMax$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.SizeWarn$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.StackSize$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.Serialize$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.ThreadIdleTime$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.ThreadPriority$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Locator\.MessageSizeMax$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Lookup$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Timeout$", false, null),
+             new Property(@"^IceLocatorDiscovery\.RetryCount$", false, null),
+             new Property(@"^IceLocatorDiscovery\.RetryDelay$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Address$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Port$", false, null),
+             new Property(@"^IceLocatorDiscovery\.Interface$", false, null),
+             new Property(@"^IceLocatorDiscovery\.InstanceName$", false, null),
              null
         };
 
@@ -1216,7 +1216,7 @@ namespace IceInternal
             IceProps,
             IceMXProps,
             IceDiscoveryProps,
-            IceGridDiscoveryProps,
+            IceLocatorDiscoveryProps,
             IceBoxProps,
             IceBoxAdminProps,
             IceGridAdminProps,
@@ -1236,7 +1236,7 @@ namespace IceInternal
             "Ice",
             "IceMX",
             "IceDiscovery",
-            "IceGridDiscovery",
+            "IceLocatorDiscovery",
             "IceBox",
             "IceBoxAdmin",
             "IceGridAdmin",