ICE-4612: Added documentation to the Slice interfaces, added missing property, renamed IceGridDiscovery/Lookup to IceGrid/Lookup

5 files changed, 6 insertions, 5 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 475a08db4b2..e8173132ac5 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, Tue Jul 15 11:44:29 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul 31 10:17:55 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -396,6 +396,7 @@ const IceInternal::Property IceGridDiscoveryPropsData[] =
     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),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 126b5ab08f0..0ea2573f46b 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Jul 15 11:44:29 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul 31 10:17:55 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index df2a0979b52..0fb84709c5e 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -574,7 +574,7 @@ Client::run(StringSeq& originalArgs)
                     lookupEndpoints = os.str();
                 }
                 
-                ObjectPrx prx = communicator()->stringToProxy("IceGridDiscovery/Lookup -d:" + lookupEndpoints);
+                ObjectPrx prx = communicator()->stringToProxy("IceGrid/Lookup -d:" + lookupEndpoints);
                 LookupPrx lookupPrx = LookupPrx::uncheckedCast(prx->ice_collocationOptimized(false));
 
                 if(properties->getProperty("IceGridAdmin.Discovery.Reply.Endpoints").empty())
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 071942cd8f5..5bc98f5b188 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -641,7 +641,7 @@ RegistryI::startImpl()
 
         try
         {
-            Ice::Identity lookupId = _communicator->stringToIdentity("IceGridDiscovery/Lookup");
+            Ice::Identity lookupId = _communicator->stringToIdentity("IceGrid/Lookup");
             discoveryAdapter = _communicator->createObjectAdapter("IceGrid.Registry.Discovery");
             discoveryAdapter->add(new LookupI(_instanceName, _wellKnownObjects), lookupId);
         }
diff --git a/cpp/src/IceGridLib/DiscoveryPluginI.cpp b/cpp/src/IceGridLib/DiscoveryPluginI.cpp
index 521bda66f22..b6c587d6c09 100644
--- a/cpp/src/IceGridLib/DiscoveryPluginI.cpp
+++ b/cpp/src/IceGridLib/DiscoveryPluginI.cpp
@@ -225,7 +225,7 @@ DiscoveryPluginI::initialize()
         lookupEndpoints = os.str();
     }
 
-    Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceGridDiscovery/Lookup -d:" + lookupEndpoints);
+    Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceGrid/Lookup -d:" + lookupEndpoints);
     lookupPrx = lookupPrx->ice_collocationOptimized(false); // No collocation optimization for the multicast proxy!
     try
     {