diff options
| -rw-r--r-- | config/PropertyNames.xml | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 176 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 46 | ||||
| -rw-r--r-- | csharp/src/Ice/PropertyNames.cs | 172 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/PropertyNames.java | 172 | ||||
| -rw-r--r-- | js/src/Ice/PropertyNames.js | 2 |
7 files changed, 287 insertions, 287 deletions
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml index 03e23624064..710e51fc24e 100644 --- a/config/PropertyNames.xml +++ b/config/PropertyNames.xml @@ -428,7 +428,7 @@ generated from the section label. <property name="DomainId"/> </section> - <section name="IceGridDiscovery"> + <section name="IceLocatorDiscovery"> <property name="Reply" class="objectadapter" /> <property name="Locator" class="objectadapter" /> <property name="Lookup"/> diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 2fab17a7c4d..6fb5dc0190e 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 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! @@ -335,95 +335,95 @@ 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[] = { @@ -1260,7 +1260,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] = IceProps, IceMXProps, IceDiscoveryProps, - IceGridDiscoveryProps, + IceLocatorDiscoveryProps, IceBoxProps, IceBoxAdminProps, IceGridAdminProps, @@ -1281,7 +1281,7 @@ const char* IceInternal::PropertyNames::clPropNames[] = "Ice", "IceMX", "IceDiscovery", - "IceGridDiscovery", + "IceLocatorDiscovery", "IceBox", "IceBoxAdmin", "IceGridAdmin", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 5b50724a7c3..2bf59c4e773 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 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! @@ -59,7 +59,7 @@ public: static const PropertyArray IceProps; static const PropertyArray IceMXProps; static const PropertyArray IceDiscoveryProps; - static const PropertyArray IceGridDiscoveryProps; + static const PropertyArray IceLocatorDiscoveryProps; static const PropertyArray IceBoxProps; static const PropertyArray IceBoxAdminProps; static const PropertyArray IceGridAdminProps; diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 834aa47a278..2ace825d1ac 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -41,14 +41,14 @@ namespace class ProcessI : public Process { public: - + ProcessI(const ActivatorPtr&, const ProcessPtr&); virtual void shutdown(const Current&); virtual void writeMessage(const std::string&, Int, const Current&); - + private: - + ActivatorPtr _activator; ProcessPtr _origProcess; }; @@ -119,11 +119,11 @@ setNoIndexingAttribute(const string& pa) } #endif -} +} -CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, - const ActivatorPtr& activator, +CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, + const ActivatorPtr& activator, bool nowarn, bool readonly, const string& initFromReplica, @@ -139,7 +139,7 @@ CollocatedRegistry::shutdown() _activator->shutdown(); } -ProcessI::ProcessI(const ActivatorPtr& activator, const ProcessPtr& origProcess) : +ProcessI::ProcessI(const ActivatorPtr& activator, const ProcessPtr& origProcess) : _activator(activator), _origProcess(origProcess) { @@ -239,7 +239,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) } initFromReplica = argv[++i]; - } + } else if(strcmp(argv[i], "--deploy") == 0) { if(i + 1 >= argc) @@ -293,7 +293,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) out << "setting `Ice.ThreadPool.Server.Size' is not useful, "; out << "you should set individual adapter thread pools instead."; } - + setupThreadPool(properties, "IceGrid.Node.ThreadPool", 1, 100); // @@ -314,7 +314,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) } communicator()->setDefaultLocator(_registry->getLocator()); - + // // Set the default locator property to point to the collocated // locator (this property is passed by the activator to each @@ -349,7 +349,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) FileException ex(__FILE__, __LINE__); ex.path = dataPath; ex.error = IceInternal::getSystemErrno(); - + ServiceError err(this); err << "property `IceGrid.Node.Data' is set to an invalid path:\n" << ex; return false; @@ -360,7 +360,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) // if(dataPath[dataPath.length() - 1] != '/') { - dataPath += "/"; + dataPath += "/"; } IcePatch2Internal::createDirectory(dataPath + "servers"); @@ -459,7 +459,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) string instanceName = properties->getProperty("IceGrid.InstanceName"); if(instanceName.empty()) { - instanceName = properties->getProperty("IceGridDiscovery.InstanceName"); + instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName"); } if(instanceName.empty()) { @@ -483,7 +483,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) _adapter->add(_node, nodeProxy->ice_getIdentity()); _adapter->addDefaultServant(new NodeServerAdminRouter(_node), _node->getServerAdminCategory()); - + // // Start the platform info thread if needed. // @@ -491,7 +491,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) // // Ensures that the locator is reachable. - // + // if(!nowarn) { try @@ -520,7 +520,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) // Replace Admin facet ProcessPtr origProcess = ProcessPtr::dynamicCast(communicator()->removeAdminFacet("Process")); communicator()->addAdminFacet(new ProcessI(_activator, origProcess), "Process"); - + Identity adminId; adminId.name = "NodeAdmin-" + name; adminId.category = instanceName; @@ -568,15 +568,15 @@ NodeService::startImpl(int argc, char* argv[], int& status) Ice::Identity regId; regId.category = instanceName; regId.name = "Registry"; - + RegistryPrx registry = RegistryPrx::checkedCast(communicator()->getDefaultLocator()->findObjectById(regId)); if(!registry) { throw "invalid registry"; } - + registry = registry->ice_preferSecure(true); // Use SSL if available. - + IceGrid::AdminSessionPrx session; if(communicator()->getProperties()->getPropertyAsInt("IceGridAdmin.AuthenticateUsingSSL")) { @@ -592,14 +592,14 @@ NodeService::startImpl(int argc, char* argv[], int& status) getline(cin, id); id = IceUtilInternal::trim(id); } - + if(password.empty()) { cout << "password: " << flush; getline(cin, password); password = IceUtilInternal::trim(password); } - + session = registry->createAdminSession(id, password); } assert(session); @@ -625,7 +625,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) catch(const AccessDeniedException& ex) { ServiceWarning warn(this); - warn << "failed to deploy application `" << desc << "':\n" + warn << "failed to deploy application `" << desc << "':\n" << "registry database is locked by `" << ex.lockUserId << "'"; } catch(const std::exception& ex) @@ -763,7 +763,7 @@ NodeService::stop() } CommunicatorPtr -NodeService::initializeCommunicator(int& argc, char* argv[], +NodeService::initializeCommunicator(int& argc, char* argv[], const InitializationData& initializationData) { InitializationData initData = initializationData; 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", diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java index 6d4edf7ec0b..e673fddea6b 100644 --- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -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 @@ public final class PropertyNames null }; - public static final Property IceGridDiscoveryProps[] = + public static final 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 }; @@ -1217,7 +1217,7 @@ public final class PropertyNames IceProps, IceMXProps, IceDiscoveryProps, - IceGridDiscoveryProps, + IceLocatorDiscoveryProps, IceBoxProps, IceBoxAdminProps, IceGridAdminProps, @@ -1237,7 +1237,7 @@ public final class PropertyNames "Ice", "IceMX", "IceDiscovery", - "IceGridDiscovery", + "IceLocatorDiscovery", "IceBox", "IceBoxAdmin", "IceGridAdmin", diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js index 71d992e6c70..3068eacd08b 100644 --- a/js/src/Ice/PropertyNames.js +++ b/js/src/Ice/PropertyNames.js @@ -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! |