summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG-3.6.md9
-rw-r--r--config/PropertyNames.xml2
-rwxr-xr-xconfig/makeprops.py4
-rw-r--r--cpp/src/Ice/PropertyNames.cpp176
-rw-r--r--cpp/src/Ice/PropertyNames.h4
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp2
-rw-r--r--cpp/src/IceGrid/ServerI.cpp10
-rw-r--r--csharp/src/Ice/PropertyNames.cs172
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java172
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java172
-rw-r--r--js/src/Ice/PropertyNames.js4
-rw-r--r--python/test/Slice/unicodePaths/run.py2
12 files changed, 365 insertions, 364 deletions
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index f29d4300c37..dbea6b7c55b 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -37,6 +37,15 @@ particular aspect of Ice.
- [Python Changes](#python-changes-2)
- [Ruby Changes](#ruby-changes-1)
+# Changes in Ice 3.6.4
+
+These are the changes since Ice 3.6.4.
+
+## General Changes
+
+- Fixed IceGrid bug where updating properties of an IceBox service at runtime
+ would fail if the service used the IceBox shared communicator. Thanks to
+ Andreas Sommer for the bug report and fix.
# Changes in Ice 3.6.3
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
index 2e1f222005c..2351ae06c55 100644
--- a/config/PropertyNames.xml
+++ b/config/PropertyNames.xml
@@ -429,7 +429,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/config/makeprops.py b/config/makeprops.py
index 127eea661a3..c87c6e3c6e5 100755
--- a/config/makeprops.py
+++ b/config/makeprops.py
@@ -473,14 +473,14 @@ class JavaCompatPropertyHandler(JavaPropertyHandler):
JavaPropertyHandler.__init__(self, inputfile, c)
def startFiles(self):
- self.srcFile = file(self.className + ".java", "wb")
+ self.srcFile = file(self.className + "-compat.java", "wb")
self.srcFile.write(javaCompatPreamble % {'inputfile' : self.inputfile, 'classname' : self.className})
def moveFiles(self, location):
dest = os.path.join(location, "java-compat", "src", "Ice", "src", "main", "java", "IceInternal")
if os.path.exists(os.path.join(dest, self.className + ".java")):
os.remove(os.path.join(dest, self.className + ".java"))
- shutil.move(self.className + ".java", dest)
+ shutil.move(self.className + "-compat.java", os.path.join(dest, self.className + ".java"))
class CSPropertyHandler(PropertyHandler):
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 1bf95a2df3b..7fd76b56b12 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 Oct 18 11:38:00 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -336,95 +336,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[] =
{
@@ -1262,7 +1262,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
IceProps,
IceMXProps,
IceDiscoveryProps,
- IceGridDiscoveryProps,
+ IceLocatorDiscoveryProps,
IceBoxProps,
IceBoxAdminProps,
IceGridAdminProps,
@@ -1284,7 +1284,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 e9c85a1e59f..c505e5aaeb5 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 Oct 18 11:38:00 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 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 463effd1e98..de7d308702e 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -452,7 +452,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())
{
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 7102acf6e28..891241ebe2f 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -328,15 +328,7 @@ private:
{
assert(_p->first.find("config_") == 0);
const string service = _p->first.substr(7);
- bool useSharedCommunicator = false;
- for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d)
- {
- if (d->name == "IceBox.UseSharedCommunicator." + service)
- {
- useSharedCommunicator = (atoi(d->value.c_str()) > 0);
- }
- }
- if (useSharedCommunicator)
+ if(getPropertyAsInt(_properties.at("config"), "IceBox.UseSharedCommunicator." + service) > 0)
{
facet = "IceBox.SharedCommunicator.Properties";
}
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index c8f412c8e34..85cc14c3f05 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 PropertyNames.xml, Thu Oct 20 16:20:13 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -329,90 +329,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
};
@@ -1215,7 +1215,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-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java
index 54e72359604..8dcb0eac059 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java
+++ b/java-compat/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 PropertyNames.xml, Tue Oct 18 11:39:01 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -329,90 +329,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
};
@@ -1216,7 +1216,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/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
index 46750aa5e7a..3408c5bc537 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file PropertyNames.xml, Tue Oct 18 11:38:54 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -329,90 +329,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
};
@@ -1216,7 +1216,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 0d1add2f012..785ad1b824f 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, Fri Oct 14 20:53:43 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -166,7 +166,7 @@ PropertyNames.IceProps =
new Property("/^Ice\.ThreadPool\.Server\.ThreadIdleTime/", false, null),
new Property("/^Ice\.ThreadPool\.Server\.ThreadPriority/", false, null),
new Property("/^Ice\.ThreadPriority/", false, null),
- new Property("/^Ice\.ToASCII/", false, null),
+ new Property("/^Ice\.ToStringMode/", false, null),
new Property("/^Ice\.Trace\.Admin\.Properties/", false, null),
new Property("/^Ice\.Trace\.Admin\.Logger/", false, null),
new Property("/^Ice\.Trace\.Locator/", false, null),
diff --git a/python/test/Slice/unicodePaths/run.py b/python/test/Slice/unicodePaths/run.py
index c6d83009cac..566a3818b81 100644
--- a/python/test/Slice/unicodePaths/run.py
+++ b/python/test/Slice/unicodePaths/run.py
@@ -36,7 +36,7 @@ if TestUtil.isAIX() or TestUtil.isLinux():
if sys.version_info[0] == 2 and TestUtil.isWin32():
print("To run this test on Windows you need to be using Python 3.x")
print("Python 2.x subprocess module doesn't support unicode on Windows")
- print("Skipping tes")
+ print("Skipping test")
sys.exit(0)
if os.environ.get("USE_BIN_DIST", "no") == "yes":
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:55:42 +0000