Fixed ICE-7882 - replaced IceBridge.Router with IceBridge.InstanceName

1 files changed, 63 insertions, 17 deletions

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 9d10afd56d9..df664c26469 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 ..\config\PropertyNames.xml, Mon Mar 27 16:51:58 2017
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue May 16 17:04:55 2017
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -14,7 +14,7 @@ package IceInternal;
 
 public final class PropertyNames
 {
-    public static final Property IceProps[] =
+    public static final Property IceProps[] = 
     {
         new Property("Ice\\.ACM\\.Client", true, null),
         new Property("Ice\\.ACM\\.Server", true, null),
@@ -196,7 +196,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceMXProps[] =
+    public static final Property IceMXProps[] = 
     {
         new Property("IceMX\\.Metrics\\.[^\\s]+\\.GroupBy", false, null),
         new Property("IceMX\\.Metrics\\.[^\\s]+\\.Map", false, null),
@@ -207,7 +207,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceDiscoveryProps[] =
+    public static final Property IceDiscoveryProps[] = 
     {
         new Property("IceDiscovery\\.Multicast\\.ACM\\.Timeout", false, null),
         new Property("IceDiscovery\\.Multicast\\.ACM\\.Heartbeat", false, null),
@@ -331,7 +331,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceLocatorDiscoveryProps[] =
+    public static final Property IceLocatorDiscoveryProps[] = 
     {
         new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Timeout", false, null),
         new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Heartbeat", false, null),
@@ -418,7 +418,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceBoxProps[] =
+    public static final Property IceBoxProps[] = 
     {
         new Property("IceBox\\.InheritProperties", false, null),
         new Property("IceBox\\.InstanceName", true, null),
@@ -440,7 +440,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceBoxAdminProps[] =
+    public static final Property IceBoxAdminProps[] = 
     {
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EndpointSelection", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.ConnectionCached", false, null),
@@ -455,7 +455,51 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceGridAdminProps[] =
+    public static final Property IceBridgeProps[] = 
+    {
+        new Property("IceBridge\\.Source\\.ACM\\.Timeout", false, null),
+        new Property("IceBridge\\.Source\\.ACM\\.Heartbeat", false, null),
+        new Property("IceBridge\\.Source\\.ACM\\.Close", false, null),
+        new Property("IceBridge\\.Source\\.ACM", false, null),
+        new Property("IceBridge\\.Source\\.AdapterId", false, null),
+        new Property("IceBridge\\.Source\\.Endpoints", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.EndpointSelection", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.ConnectionCached", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.PreferSecure", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.LocatorCacheTimeout", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.InvocationTimeout", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.Locator", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.Router", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.CollocationOptimized", false, null),
+        new Property("IceBridge\\.Source\\.Locator\\.Context\\.[^\\s]+", false, null),
+        new Property("IceBridge\\.Source\\.Locator", false, null),
+        new Property("IceBridge\\.Source\\.PublishedEndpoints", false, null),
+        new Property("IceBridge\\.Source\\.ReplicaGroupId", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.EndpointSelection", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.ConnectionCached", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.PreferSecure", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.LocatorCacheTimeout", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.InvocationTimeout", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.Locator", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.Router", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.CollocationOptimized", false, null),
+        new Property("IceBridge\\.Source\\.Router\\.Context\\.[^\\s]+", false, null),
+        new Property("IceBridge\\.Source\\.Router", false, null),
+        new Property("IceBridge\\.Source\\.ProxyOptions", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.Size", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.SizeMax", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.StackSize", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.Serialize", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.ThreadIdleTime", false, null),
+        new Property("IceBridge\\.Source\\.ThreadPool\\.ThreadPriority", false, null),
+        new Property("IceBridge\\.Source\\.MessageSizeMax", false, null),
+        new Property("IceBridge\\.Target\\.Endpoints", false, null),
+        new Property("IceBridge\\.InstanceName", false, null),
+        null
+    };
+
+    public static final Property IceGridAdminProps[] = 
     {
         new Property("IceGridAdmin\\.AuthenticateUsingSSL", false, null),
         new Property("IceGridAdmin\\.MetricsConfig", false, null),
@@ -547,7 +591,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceGridProps[] =
+    public static final Property IceGridProps[] = 
     {
         new Property("IceGrid\\.AdminRouter\\.ACM\\.Timeout", false, null),
         new Property("IceGrid\\.AdminRouter\\.ACM\\.Heartbeat", false, null),
@@ -950,7 +994,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IcePatch2Props[] =
+    public static final Property IcePatch2Props[] = 
     {
         new Property("IcePatch2\\.ACM\\.Timeout", false, null),
         new Property("IcePatch2\\.ACM\\.Heartbeat", false, null),
@@ -994,7 +1038,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IcePatch2ClientProps[] =
+    public static final Property IcePatch2ClientProps[] = 
     {
         new Property("IcePatch2Client\\.ChunkSize", false, null),
         new Property("IcePatch2Client\\.Directory", false, null),
@@ -1004,7 +1048,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceSSLProps[] =
+    public static final Property IceSSLProps[] = 
     {
         new Property("IceSSL\\.Alias", false, null),
         new Property("IceSSL\\.CAs", false, null),
@@ -1052,7 +1096,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceStormAdminProps[] =
+    public static final Property IceStormAdminProps[] = 
     {
         new Property("IceStormAdmin\\.TopicManager\\.[^\\s]+", false, null),
         new Property("IceStormAdmin\\.Host", false, null),
@@ -1060,14 +1104,14 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceBTProps[] =
+    public static final Property IceBTProps[] = 
     {
         new Property("IceBT\\.RcvSize", false, null),
         new Property("IceBT\\.SndSize", false, null),
         null
     };
 
-    public static final Property Glacier2Props[] =
+    public static final Property Glacier2Props[] = 
     {
         new Property("Glacier2\\.AddConnectionContext", false, null),
         new Property("Glacier2\\.Client\\.ACM\\.Timeout", false, null),
@@ -1214,14 +1258,14 @@ public final class PropertyNames
         null
     };
 
-    public static final Property Glacier2CryptPermissionsVerifierProps[] =
+    public static final Property Glacier2CryptPermissionsVerifierProps[] = 
     {
         new Property("Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.PermissionsVerifier", false, null),
         new Property("Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.AdminPermissionsVerifier", false, null),
         null
     };
 
-    public static final Property FreezeProps[] =
+    public static final Property FreezeProps[] = 
     {
         new Property("Freeze\\.DbEnv\\.[^\\s]+\\.CheckpointPeriod", false, null),
         new Property("Freeze\\.DbEnv\\.[^\\s]+\\.DbHome", false, null),
@@ -1261,6 +1305,7 @@ public final class PropertyNames
         IceLocatorDiscoveryProps,
         IceBoxProps,
         IceBoxAdminProps,
+        IceBridgeProps,
         IceGridAdminProps,
         IceGridProps,
         IcePatch2Props,
@@ -1282,6 +1327,7 @@ public final class PropertyNames
         "IceLocatorDiscovery",
         "IceBox",
         "IceBoxAdmin",
+        "IceBridge",
         "IceGridAdmin",
         "IceGrid",
         "IcePatch2",