ICE-4612: first cut of the IceGrid discovery plugin and APIs

1 files changed, 172 insertions, 1 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index c173ecfaa82..acadc7fb151 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Jun  5 21:19:31 2014
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Jul  9 18:08:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -319,6 +319,93 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceDiscoveryProps(IceDiscoveryPropsData,
                                                 sizeof(IceDiscoveryPropsData)/sizeof(IceDiscoveryPropsData[0]));
 
+const IceInternal::Property IceGridDiscoveryPropsData[] = 
+{
+    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.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.Lookup", false, 0),
+    IceInternal::Property("IceGridDiscovery.Timeout", false, 0),
+    IceInternal::Property("IceGridDiscovery.RetryCount", 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),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceGridDiscoveryProps(IceGridDiscoveryPropsData,
+                                                sizeof(IceGridDiscoveryPropsData)/sizeof(IceGridDiscoveryPropsData[0]));
+
 const IceInternal::Property IceBoxPropsData[] = 
 {
     IceInternal::Property("IceBox.InheritProperties", false, 0),
@@ -395,6 +482,48 @@ const IceInternal::Property IceGridAdminPropsData[] =
     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.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.Trace.Observers", false, 0),
     IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", false, 0),
 };
@@ -603,6 +732,46 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
     IceInternal::Property("IceGrid.Registry.Data", 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.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),
@@ -1073,6 +1242,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IceProps,
     IceMXProps,
     IceDiscoveryProps,
+    IceGridDiscoveryProps,
     IceBoxProps,
     IceBoxAdminProps,
     IceGridAdminProps,
@@ -1092,6 +1262,7 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "Ice",
     "IceMX",
     "IceDiscovery",
+    "IceGridDiscovery",
     "IceBox",
     "IceBoxAdmin",
     "IceGridAdmin",