Fixed ICE-5318: Review IceGrid timeout defaults

35 files changed, 110 insertions, 101 deletions

diff --git a/cpp/demo/IceGrid/allocate/config.client b/cpp/demo/IceGrid/allocate/config.client
index b79723c77b9..fa396067447 100644
--- a/cpp/demo/IceGrid/allocate/config.client
+++ b/cpp/demo/IceGrid/allocate/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cpp/demo/IceGrid/allocate/config.grid b/cpp/demo/IceGrid/allocate/config.grid
index ce94ec9c1a6..a608c1d429a 100644
--- a/cpp/demo/IceGrid/allocate/config.grid
+++ b/cpp/demo/IceGrid/allocate/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -24,7 +24,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cpp/demo/IceGrid/customLoadBalancing/config.client b/cpp/demo/IceGrid/customLoadBalancing/config.client
index c3052ac6814..ff81efe9136 100644
--- a/cpp/demo/IceGrid/customLoadBalancing/config.client
+++ b/cpp/demo/IceGrid/customLoadBalancing/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061 -t 30000
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cpp/demo/IceGrid/customLoadBalancing/config.grid b/cpp/demo/IceGrid/customLoadBalancing/config.grid
index 9179973b8d7..118608cc9da 100644
--- a/cpp/demo/IceGrid/customLoadBalancing/config.grid
+++ b/cpp/demo/IceGrid/customLoadBalancing/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -30,7 +30,7 @@ Ice.Plugin.RegistryPlugin=RegistryPlugin:createRegistryPlugin
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cpp/demo/IceGrid/icebox/config.client b/cpp/demo/IceGrid/icebox/config.client
index 9587857c00f..bc3c0aa673a 100644
--- a/cpp/demo/IceGrid/icebox/config.client
+++ b/cpp/demo/IceGrid/icebox/config.client
@@ -7,7 +7,7 @@ Hello.Proxy=hello
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cpp/demo/IceGrid/icebox/config.grid b/cpp/demo/IceGrid/icebox/config.grid
index 0a7914843ac..33036a24f98 100644
--- a/cpp/demo/IceGrid/icebox/config.grid
+++ b/cpp/demo/IceGrid/icebox/config.grid
@@ -6,19 +6,19 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 
 #
 # Enable the admin session manager for use with Glacier2.
 #
-IceGrid.Registry.AdminSessionManager.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.AdminSessionManager.Endpoints=default -h localhost
 
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -30,7 +30,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cpp/demo/IceGrid/replication/config.client b/cpp/demo/IceGrid/replication/config.client
index 19e3de030b4..8d3489f2ec7 100644
--- a/cpp/demo/IceGrid/replication/config.client
+++ b/cpp/demo/IceGrid/replication/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000:default -h localhost -p 12001:default -h localhost -p 12002
+Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -p 12000:default -p 12001:default -p 12002
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
@@ -11,7 +11,8 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000
 #Ice.Plugin.IceGridDiscovery=IceGrid:createIceGridDiscovery
 #IceGridDiscovery.InstanceName=ReplicationDemoIceGrid
 
-Ice.Override.Timeout=10000
+Ice.Default.Timeout=10000
+Ice.Default.Host=localhost
 
 #
 # Trace properties.
@@ -24,4 +25,3 @@ Ice.Override.Timeout=10000
 #
 IceGridAdmin.Username=benoit
 IceGridAdmin.Password=dummy
-
diff --git a/cpp/demo/IceGrid/replication/config.master b/cpp/demo/IceGrid/replication/config.master
index c5c33a9c153..75b92ecceb7 100644
--- a/cpp/demo/IceGrid/replication/config.master
+++ b/cpp/demo/IceGrid/replication/config.master
@@ -6,13 +6,15 @@ IceGrid.InstanceName=ReplicationDemoIceGrid
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -h localhost -p 12000 -t 10000
-IceGrid.Registry.Server.Endpoints=default -h localhost -t 10000
-IceGrid.Registry.Internal.Endpoints=default -h localhost -t 10000
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 12000
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/master
 IceGrid.Registry.PermissionsVerifier=ReplicationDemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=ReplicationDemoIceGrid/NullPermissionsVerifier
 
+Ice.Default.Timeout=10000
+
 Ice.StdErr=db/master/stderr.txt
 Ice.StdOut=db/master/stdout.txt
 
diff --git a/cpp/demo/IceGrid/replication/config.node1 b/cpp/demo/IceGrid/replication/config.node1
index 007b3e1081c..77a94fb8fea 100644
--- a/cpp/demo/IceGrid/replication/config.node1
+++ b/cpp/demo/IceGrid/replication/config.node1
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 -t 10000:default -h localhost -p 12001 -t 10000:default -h localhost -p 12002 -t 10000
+Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000:default -h localhost -p 12001:default -h localhost -p 12002
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
@@ -15,9 +15,11 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 10000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node1
 
+Ice.Default.Timeout=10000
+
 Ice.StdErr=db/node1/stderr.txt
 Ice.StdOut=db/node1/stdout.txt
 
diff --git a/cpp/demo/IceGrid/replication/config.node2 b/cpp/demo/IceGrid/replication/config.node2
index b787aa62edb..77bd5c6e872 100644
--- a/cpp/demo/IceGrid/replication/config.node2
+++ b/cpp/demo/IceGrid/replication/config.node2
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 -t 10000:default -h localhost -p 12001 -t 10000:default -h localhost -p 12002 -t 10000
+Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000:default -h localhost -p 12001:default -h localhost -p 12002
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
@@ -15,9 +15,11 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node2
-IceGrid.Node.Endpoints=default -t 10000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node2
 
+Ice.Default.Timeout=10000
+
 Ice.StdErr=db/node2/stderr.txt
 Ice.StdOut=db/node2/stdout.txt
 
diff --git a/cpp/demo/IceGrid/replication/config.replica1 b/cpp/demo/IceGrid/replication/config.replica1
index e23bd32f2a5..ef6d47f0f81 100644
--- a/cpp/demo/IceGrid/replication/config.replica1
+++ b/cpp/demo/IceGrid/replication/config.replica1
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 -t 10000:default -h localhost -p 12002 -t 10000
+Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000:default -h localhost -p 12002
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
@@ -14,14 +14,16 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -h localhost -p 12001 -t 10000
-IceGrid.Registry.Server.Endpoints=default -h localhost -t 10000
-IceGrid.Registry.Internal.Endpoints=default -h localhost -t 10000
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 12001
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/replica1
 IceGrid.Registry.ReplicaName=Replica1
 IceGrid.Registry.PermissionsVerifier=ReplicationDemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=ReplicationDemoIceGrid/NullPermissionsVerifier
 
+Ice.Default.Timeout=10000
+
 Ice.StdErr=db/replica1/stderr.txt
 Ice.StdOut=db/replica1/stdout.txt
 
diff --git a/cpp/demo/IceGrid/replication/config.replica2 b/cpp/demo/IceGrid/replication/config.replica2
index e122e707a47..9ff26e9eaa6 100644
--- a/cpp/demo/IceGrid/replication/config.replica2
+++ b/cpp/demo/IceGrid/replication/config.replica2
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000 -t 10000:default -h localhost -p 12001 -t 10000
+Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000:default -h localhost -p 12001
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
@@ -14,14 +14,16 @@ Ice.Default.Locator=ReplicationDemoIceGrid/Locator:default -h localhost -p 12000
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -h localhost -p 12002 -t 10000
-IceGrid.Registry.Server.Endpoints=default -h localhost -t 10000
-IceGrid.Registry.Internal.Endpoints=default -h localhost -t 10000
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 12002
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/replica2
 IceGrid.Registry.ReplicaName=Replica2
 IceGrid.Registry.PermissionsVerifier=ReplicationDemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=ReplicationDemoIceGrid/NullPermissionsVerifier
 
+Ice.Default.Timeout=10000
+
 Ice.StdErr=db/replica2/stderr.txt
 Ice.StdOut=db/replica2/stdout.txt
 
diff --git a/cpp/demo/IceGrid/secure/config.admin b/cpp/demo/IceGrid/secure/config.admin
index b411c728388..624b7305fec 100644
--- a/cpp/demo/IceGrid/secure/config.admin
+++ b/cpp/demo/IceGrid/secure/config.admin
@@ -1,5 +1,5 @@
-Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062 -t 10000
-#Ice.Default.Router=DemoGlacier2/router:ssl -h localhost -p 4064 -t 10000
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062
+#Ice.Default.Router=DemoGlacier2/router:ssl -h localhost -p 4064
 
 IceGridAdmin.Username=demo
 IceGridAdmin.Password=dummy
diff --git a/cpp/demo/IceGrid/secure/config.client b/cpp/demo/IceGrid/secure/config.client
index 03cfd282823..284e3214a93 100644
--- a/cpp/demo/IceGrid/secure/config.client
+++ b/cpp/demo/IceGrid/secure/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:tcp -t 10000 -h localhost -p 4061:tcp -t 10000 -h localhost -p 14061
+Ice.Default.Locator=DemoIceGrid/Locator:tcp -h localhost -p 4061:tcp -h localhost -p 14061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cpp/demo/IceGrid/secure/config.glacier2 b/cpp/demo/IceGrid/secure/config.glacier2
index a54d78c70a2..07376691d18 100644
--- a/cpp/demo/IceGrid/secure/config.glacier2
+++ b/cpp/demo/IceGrid/secure/config.glacier2
@@ -11,7 +11,7 @@ Glacier2.PermissionsVerifier=DemoGlacier2/NullPermissionsVerifier
 
 Glacier2.SessionTimeout=30
 
-Ice.Default.Locator=DemoIceGrid/Locator:ssl -t 10000 -h localhost -p 4062
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062
 
 #
 # SSL Configuration
diff --git a/cpp/demo/IceGrid/secure/config.master b/cpp/demo/IceGrid/secure/config.master
index 551bc373cfb..e2eea144ce9 100644
--- a/cpp/demo/IceGrid/secure/config.master
+++ b/cpp/demo/IceGrid/secure/config.master
@@ -6,9 +6,9 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=tcp -h localhost -p 4061 -t 10000:ssl -h localhost -p 4062 -t 10000
-IceGrid.Registry.Server.Endpoints=ssl -h localhost -t 10000
-IceGrid.Registry.Internal.Endpoints=ssl -h localhost -t 10000
+IceGrid.Registry.Client.Endpoints=tcp -h localhost -p 4061:ssl -h localhost -p 4062
+IceGrid.Registry.Server.Endpoints=ssl -h localhost
+IceGrid.Registry.Internal.Endpoints=ssl -h localhost
 IceGrid.Registry.Data=db/master
 
 #
@@ -22,7 +22,7 @@ IceGrid.Registry.RequireReplicaCertCN=1
 # IceGrid admin clients must use a secure connection to connect to the
 # registry or use Glacier2.
 #
-IceGrid.Registry.AdminSessionManager.Endpoints=ssl -h localhost -t 10000
+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -h localhost
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 
 #
diff --git a/cpp/demo/IceGrid/secure/config.node b/cpp/demo/IceGrid/secure/config.node
index 7b9864cea3e..8d7c0b033dc 100644
--- a/cpp/demo/IceGrid/secure/config.node
+++ b/cpp/demo/IceGrid/secure/config.node
@@ -1,13 +1,13 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062 -t 10000:ssl -h localhost -p 14062 -t 10000
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062:ssl -h localhost -p 14062
 
 #
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=Node
-IceGrid.Node.Endpoints=ssl -h localhost -t 10000
+IceGrid.Node.Endpoints=ssl -h localhost
 IceGrid.Node.Data=db/node
 
 #
diff --git a/cpp/demo/IceGrid/secure/config.slave b/cpp/demo/IceGrid/secure/config.slave
index 682651e969a..5fdee08280e 100644
--- a/cpp/demo/IceGrid/secure/config.slave
+++ b/cpp/demo/IceGrid/secure/config.slave
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062 -t 10000
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -h localhost -p 4062
 
 #
 # The IceGrid instance name.
@@ -11,9 +11,9 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=tcp -h localhost -p 14061 -t 10000:ssl -h localhost -p 14062 -t 10000
-IceGrid.Registry.Server.Endpoints=ssl -h localhost -t 10000
-IceGrid.Registry.Internal.Endpoints=ssl -h localhost -t 10000
+IceGrid.Registry.Client.Endpoints=tcp -h localhost -p 14061:ssl -h localhost -p 14062
+IceGrid.Registry.Server.Endpoints=ssl -h localhost
+IceGrid.Registry.Internal.Endpoints=ssl -h localhost
 IceGrid.Registry.Data=db/slave
 IceGrid.Registry.ReplicaName=Slave
 
@@ -27,7 +27,7 @@ IceGrid.Registry.RequireNodeCertCN=1
 # IceGrid admin clients must use a secure connection to connect to the
 # registry or use Glacier2.
 #
-IceGrid.Registry.AdminSessionManager.Endpoints=ssl -h localhost -t 10000
+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -h localhost
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 
 #
diff --git a/cpp/demo/IceGrid/sessionActivation/config.client b/cpp/demo/IceGrid/sessionActivation/config.client
index b79723c77b9..fa396067447 100644
--- a/cpp/demo/IceGrid/sessionActivation/config.client
+++ b/cpp/demo/IceGrid/sessionActivation/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cpp/demo/IceGrid/sessionActivation/config.grid b/cpp/demo/IceGrid/sessionActivation/config.grid
index ce94ec9c1a6..a608c1d429a 100644
--- a/cpp/demo/IceGrid/sessionActivation/config.grid
+++ b/cpp/demo/IceGrid/sessionActivation/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -24,7 +24,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cpp/demo/IceGrid/simple/config.client b/cpp/demo/IceGrid/simple/config.client
index 0af701e0ab7..fa396067447 100644
--- a/cpp/demo/IceGrid/simple/config.client
+++ b/cpp/demo/IceGrid/simple/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061 -t 30000
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cpp/demo/IceGrid/simple/config.grid b/cpp/demo/IceGrid/simple/config.grid
index 4e1e7c59771..1d013623289 100644
--- a/cpp/demo/IceGrid/simple/config.grid
+++ b/cpp/demo/IceGrid/simple/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -24,7 +24,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 0247b858704..33ef5142a85 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -830,7 +830,6 @@ IceInternal::Instance::setServerProcessProxy(const ObjectAdapterPtr& adminAdapte
     ObjectPrx admin = adminAdapter->createProxy(adminIdentity);
     LocatorPrx locator = adminAdapter->getLocator();
     const string serverId = _initData.properties->getProperty("Ice.Admin.ServerId");
-    
     if(locator && serverId != "")
     {
         ProcessPrx process = ProcessPrx::uncheckedCast(admin->ice_facet("Process"));
diff --git a/cs/demo/IceGrid/icebox/config.client b/cs/demo/IceGrid/icebox/config.client
index 035e568c18a..7d9839fb221 100644
--- a/cs/demo/IceGrid/icebox/config.client
+++ b/cs/demo/IceGrid/icebox/config.client
@@ -7,4 +7,4 @@ Hello.Proxy=hello
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
diff --git a/cs/demo/IceGrid/icebox/config.grid b/cs/demo/IceGrid/icebox/config.grid
index 0a7914843ac..33036a24f98 100644
--- a/cs/demo/IceGrid/icebox/config.grid
+++ b/cs/demo/IceGrid/icebox/config.grid
@@ -6,19 +6,19 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 
 #
 # Enable the admin session manager for use with Glacier2.
 #
-IceGrid.Registry.AdminSessionManager.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.AdminSessionManager.Endpoints=default -h localhost
 
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -30,7 +30,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cs/demo/IceGrid/simple/config.client b/cs/demo/IceGrid/simple/config.client
index c558406993b..f0ed657c699 100644
--- a/cs/demo/IceGrid/simple/config.client
+++ b/cs/demo/IceGrid/simple/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/cs/demo/IceGrid/simple/config.grid b/cs/demo/IceGrid/simple/config.grid
index ce94ec9c1a6..a608c1d429a 100644
--- a/cs/demo/IceGrid/simple/config.grid
+++ b/cs/demo/IceGrid/simple/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -24,7 +24,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/java/demo/IceGrid/icebox/config.client b/java/demo/IceGrid/icebox/config.client
index 035e568c18a..7d9839fb221 100644
--- a/java/demo/IceGrid/icebox/config.client
+++ b/java/demo/IceGrid/icebox/config.client
@@ -7,4 +7,4 @@ Hello.Proxy=hello
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
diff --git a/java/demo/IceGrid/icebox/config.grid b/java/demo/IceGrid/icebox/config.grid
index a9872d48900..c70615b2b9e 100644
--- a/java/demo/IceGrid/icebox/config.grid
+++ b/java/demo/IceGrid/icebox/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 
 #
 # Enable the admin session manager for use with Glacier2.
@@ -30,7 +30,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/java/demo/IceGrid/simple/config.client b/java/demo/IceGrid/simple/config.client
index c558406993b..f0ed657c699 100644
--- a/java/demo/IceGrid/simple/config.client
+++ b/java/demo/IceGrid/simple/config.client
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # To use the IceGrid discovery plugin comment out the default locator
diff --git a/java/demo/IceGrid/simple/config.grid b/java/demo/IceGrid/simple/config.grid
index ce94ec9c1a6..a608c1d429a 100644
--- a/java/demo/IceGrid/simple/config.grid
+++ b/java/demo/IceGrid/simple/config.grid
@@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -24,7 +24,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/py/demo/IceGrid/simple/config.client b/py/demo/IceGrid/simple/config.client
index 144526d6035..8e66d3dd1c9 100644
--- a/py/demo/IceGrid/simple/config.client
+++ b/py/demo/IceGrid/simple/config.client
@@ -1,4 +1,4 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
diff --git a/py/demo/IceGrid/simple/config.grid b/py/demo/IceGrid/simple/config.grid
index 32833037ecc..b5871c6e3a3 100644
--- a/py/demo/IceGrid/simple/config.grid
+++ b/py/demo/IceGrid/simple/config.grid
@@ -3,14 +3,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 30000 -h localhost
+IceGrid.Node.Endpoints=default -h localhost
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/vb/demo/IceGrid/simple/config.client b/vb/demo/IceGrid/simple/config.client
index 144526d6035..8e66d3dd1c9 100644
--- a/vb/demo/IceGrid/simple/config.client
+++ b/vb/demo/IceGrid/simple/config.client
@@ -1,4 +1,4 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
diff --git a/vb/demo/IceGrid/simple/config.grid b/vb/demo/IceGrid/simple/config.grid
index 2c4366746e9..06235e80cf2 100644
--- a/vb/demo/IceGrid/simple/config.grid
+++ b/vb/demo/IceGrid/simple/config.grid
@@ -3,14 +3,14 @@ IceGrid.InstanceName=DemoIceGrid
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:default -t 30000 -h localhost -p 4061
+Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061
 
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -t 30000 -h localhost -p 4061
-IceGrid.Registry.Server.Endpoints=default -t 30000 -h localhost
-IceGrid.Registry.Internal.Endpoints=default -t 30000 -h localhost
+IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061
+IceGrid.Registry.Server.Endpoints=default -h localhost
+IceGrid.Registry.Internal.Endpoints=default -h localhost
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier