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

4 files changed, 55 insertions, 8 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 256efdd7913..adfc4c3802e 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, 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!
 
@@ -471,6 +471,53 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxAdminProps(IceBoxAdminPropsData,
                                                 sizeof(IceBoxAdminPropsData)/sizeof(IceBoxAdminPropsData[0]));
 
+const IceInternal::Property IceBridgePropsData[] =
+{
+    IceInternal::Property("IceBridge.Source.ACM.Timeout", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM.Close", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM", false, 0),
+    IceInternal::Property("IceBridge.Source.AdapterId", false, 0),
+    IceInternal::Property("IceBridge.Source.Endpoints", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.Locator", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.Router", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.Context.*", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator", false, 0),
+    IceInternal::Property("IceBridge.Source.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceBridge.Source.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.Locator", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.Router", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.Context.*", false, 0),
+    IceInternal::Property("IceBridge.Source.Router", false, 0),
+    IceInternal::Property("IceBridge.Source.ProxyOptions", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceBridge.Source.MessageSizeMax", false, 0),
+    IceInternal::Property("IceBridge.Target.Endpoints", false, 0),
+    IceInternal::Property("IceBridge.InstanceName", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceBridgeProps(IceBridgePropsData,
+                                                sizeof(IceBridgePropsData)/sizeof(IceBridgePropsData[0]));
+
 const IceInternal::Property IceGridAdminPropsData[] =
 {
     IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
@@ -1307,6 +1354,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IceLocatorDiscoveryProps,
     IceBoxProps,
     IceBoxAdminProps,
+    IceBridgeProps,
     IceGridAdminProps,
     IceGridProps,
     IcePatch2Props,
@@ -1329,6 +1377,7 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "IceLocatorDiscovery",
     "IceBox",
     "IceBoxAdmin",
+    "IceBridge",
     "IceGridAdmin",
     "IceGrid",
     "IcePatch2",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 2e448162df5..68085fa56c4 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, 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!
 
@@ -62,6 +62,7 @@ public:
     static const PropertyArray IceLocatorDiscoveryProps;
     static const PropertyArray IceBoxProps;
     static const PropertyArray IceBoxAdminProps;
+    static const PropertyArray IceBridgeProps;
     static const PropertyArray IceGridAdminProps;
     static const PropertyArray IceGridProps;
     static const PropertyArray IcePatch2Props;
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp
index bb9c105015a..3e96507d0ea 100644
--- a/cpp/src/IceBridge/IceBridge.cpp
+++ b/cpp/src/IceBridge/IceBridge.cpp
@@ -682,11 +682,9 @@ BridgeService::start(int argc, char* argv[], int& status)
 
     adapter->addDefaultServant(new BridgeI(adapter, target), "");
 
-    if(properties->getPropertyAsIntWithDefault("IceBridge.Router", 0) > 0)
-    {
-        RouterPrx router = RouterPrx::uncheckedCast(adapter->add(new RouterI, stringToIdentity("IceBridge/router")));
-        adapter->add(new FinderI(router), stringToIdentity("Ice/RouterFinder"));
-    }
+    string instanceName = properties->getPropertyWithDefault("IceBridge.InstanceName", "IceBridge");
+    RouterPrx router = RouterPrx::uncheckedCast(adapter->add(new RouterI, stringToIdentity(instanceName + "/router")));
+    adapter->add(new FinderI(router), stringToIdentity("Ice/RouterFinder"));
 
     try
     {
diff --git a/cpp/test/IceBridge/simple/test.py b/cpp/test/IceBridge/simple/test.py
index d22d6f27889..df74e8c4a0a 100644
--- a/cpp/test/IceBridge/simple/test.py
+++ b/cpp/test/IceBridge/simple/test.py
@@ -17,7 +17,6 @@ class IceBridge(ProcessFromBinDir, Server):
         props = Server.getProps(self, current);
         props.update({
             'Ice.Warn.Dispatch' : 0,
-            'IceBridge.Router' : 1,
             'IceBridge.Target.Endpoints' : current.getTestEndpoint(0) + ":" + current.getTestEndpoint(0, "udp"),
             'IceBridge.Source.Endpoints' : current.getTestEndpoint(1) + ":" + current.getTestEndpoint(1, "udp"),
             'Ice.Admin.Endpoints' : current.getTestEndpoint(2, "tcp"),