Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Access/3.3/app.config
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Access/3.3/app.config	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Access/3.3/app.config	(revision 9461)
@@ -29,9 +29,9 @@
         </bindings>
         <client>
-            <endpoint address="http://services.heuristiclab.com/AccessService-3.3/AccessService.svc" binding="wsHttpBinding"
+            <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="wsHttpBinding"
                 bindingConfiguration="WSHttpBinding_IAccessService" contract="HeuristicLab.Clients.Access.IAccessService"
                 name="WSHttpBinding_IAccessService">
                 <identity>
-                    <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
+                    <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
                 </identity>
             </endpoint>
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config	(revision 9461)
@@ -29,4 +29,14 @@
         </binding>
       </wsHttpBinding>
+      <netTcpBinding>
+        <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <security mode="TransportWithMessageCredential">
+            <transport clientCredentialType="Windows" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </netTcpBinding>
     </bindings>
     
@@ -39,5 +49,5 @@
    <client>
      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-    <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" 
+    <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" 
               binding="wsHttpBinding" 
               bindingConfiguration="wsHttpBinding_Hive" 
@@ -45,7 +55,12 @@
               name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
       <identity>
-        <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
+        <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
       </identity>
     </endpoint>
+     <endpoint address="net.tcp://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+       <identity>
+         <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
+       </identity>
+     </endpoint>
    </client>
    
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config	(revision 9461)
@@ -2,4 +2,7 @@
 <configuration>
   <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
       <section name="HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
@@ -22,5 +25,5 @@
     <bindings>
       <wsHttpBinding>
-        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
@@ -31,4 +34,14 @@
         </binding>
       </wsHttpBinding>
+      <netTcpBinding>
+        <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <security mode="TransportWithMessageCredential">
+            <transport clientCredentialType="Windows" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </netTcpBinding>
     </bindings>
     
@@ -40,5 +53,5 @@
  
    <client>
-     <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
+      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
       <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc"
                 binding="wsHttpBinding"
@@ -46,11 +59,29 @@
                 contract="HeuristicLab.Clients.Hive.IHiveService"
                 name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
-          <identity>
-        <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
-      </identity>
-    </endpoint>
-   </client>
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
+        </identity>
+      </endpoint>
+     <endpoint address="net.tcp://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+       <identity>
+         <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
+       </identity>
+     </endpoint>
+     </client>
    
- </system.serviceModel>
+  </system.serviceModel>
+
+  <applicationSettings>
+    <HeuristicLab.Clients.Hive.Settings>
+      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
+        <value>
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <string>netTcpBinding_IHiveService</string>
+            <string>wsHttpBinding_IHiveService</string>
+          </ArrayOfString>
+        </value>
+      </setting>
+    </HeuristicLab.Clients.Hive.Settings>
+  </applicationSettings>
   
   <userSettings>
@@ -62,5 +93,5 @@
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
       <setting name="HeartbeatInterval" serializeAs="String">
-        <value>00:00:20</value>
+        <value>00:00:30</value>
       </setting>
       <setting name="LastUsedFileName" serializeAs="String">
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config	(revision 9461)
@@ -32,5 +32,5 @@
     <client>
       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc"
                 binding="wsHttpBinding"
                 bindingConfiguration="wsHttpBinding_Hive"
@@ -38,5 +38,5 @@
                 name="wsHttpBinding_IHiveService">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
+          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
         </identity>
       </endpoint>
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs	(revision 9461)
@@ -2,5 +2,5 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.586
+//     Runtime Version:4.0.30319.18034
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -13,5 +13,5 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -26,5 +26,5 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("00:00:40")]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:30")]
         public global::System.TimeSpan HeartbeatInterval {
             get {
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings	(revision 9461)
@@ -4,5 +4,5 @@
   <Settings>
     <Setting Name="HeartbeatInterval" Type="System.TimeSpan" Scope="User">
-      <Value Profile="(Default)">00:00:40</Value>
+      <Value Profile="(Default)">00:00:30</Value>
     </Setting>
     <Setting Name="LastUsedFileName" Type="System.String" Scope="User">
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config	(revision 9461)
@@ -33,4 +33,14 @@
         </binding>
       </wsHttpBinding>
+      <netTcpBinding>
+        <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <security mode="TransportWithMessageCredential">
+            <transport clientCredentialType="Windows" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </netTcpBinding>
     </bindings>
     <services>
@@ -41,7 +51,12 @@
     <client>
       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+      <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU="/>
+        </identity>
+      </endpoint>
+      <endpoint address="net.tcp://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
         </identity>
       </endpoint>
@@ -51,5 +66,5 @@
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
       <setting name="HeartbeatInterval" serializeAs="String">
-        <value>00:00:40</value>
+        <value>00:00:30</value>
       </setting>
       <setting name="LastUsedFileName" serializeAs="String">
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs	(revision 9461)
@@ -438,5 +438,5 @@
 
         refreshableJob.Progress.Status = "Downloading tasks...";
-        downloader = new TaskDownloader(allTasks.Select(x => x.Id));
+        downloader = new TaskDownloader(allTasks.Select(x => x.Id), refreshableJob.Log);
         downloader.StartAsync();
 
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs	(revision 9461)
@@ -47,10 +47,39 @@
     }
 
+    private int endpointRetries;
+
+    private string workingEndpoint;
+
     private HiveServiceClient NewServiceClient() {
-      HiveServiceClient cl;
+      if (endpointRetries >= Settings.Default.MaxEndpointRetries) {
+        return CreateClient(workingEndpoint);
+      }
+
+      var configurations = Settings.Default.EndpointConfigurationPriorities;
+
+      Exception exception = null;
+      foreach (var endpointConfigurationName in configurations) {
+        try {
+          var cl = CreateClient(endpointConfigurationName);
+          cl.Open();
+          workingEndpoint = endpointConfigurationName;
+          return cl;
+        }
+        catch (Exception exc) {
+          exception = exc;
+          endpointRetries++;
+        }
+      }
+
+      throw exception;
+    }
+
+    private HiveServiceClient CreateClient(string endpointConfigurationName) {
+      HiveServiceClient cl = null;
+
       if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password))
-        cl = ClientFactory.CreateClient<HiveServiceClient, IHiveService>();
+        cl = ClientFactory.CreateClient<HiveServiceClient, IHiveService>(endpointConfigurationName);
       else
-        cl = ClientFactory.CreateClient<HiveServiceClient, IHiveService>(null, null, username, password);
+        cl = ClientFactory.CreateClient<HiveServiceClient, IHiveService>(endpointConfigurationName, null, username, password);
 
       return cl;
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs	(revision 9461)
@@ -2,5 +2,5 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.586
+//     Runtime Version:4.0.30319.18034
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -13,5 +13,5 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -26,5 +26,5 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1")]
+        [global::System.Configuration.DefaultSettingValueAttribute("16")]
         public int MaxParallelUploads {
             get {
@@ -53,5 +53,5 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        [global::System.Configuration.DefaultSettingValueAttribute("4")]
         public int MaxParallelDownloads {
             get {
@@ -77,4 +77,26 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
+<ArrayOfString xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+  <string>netTcpBinding_IHiveService</string>
+  <string>wsHttpBinding_IHiveService</string>
+</ArrayOfString>")]
+        public global::System.Collections.Specialized.StringCollection EndpointConfigurationPriorities {
+            get {
+                return ((global::System.Collections.Specialized.StringCollection)(this["EndpointConfigurationPriorities"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("5")]
+        public int MaxEndpointRetries {
+            get {
+                return ((int)(this["MaxEndpointRetries"]));
+            }
+        }
     }
 }
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.settings
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.settings	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.settings	(revision 9461)
@@ -4,5 +4,5 @@
   <Settings>
     <Setting Name="MaxParallelUploads" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">1</Value>
+      <Value Profile="(Default)">16</Value>
     </Setting>
     <Setting Name="HLBinaryName" Type="System.String" Scope="Application">
@@ -13,5 +13,5 @@
     </Setting>
     <Setting Name="MaxParallelDownloads" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">2</Value>
+      <Value Profile="(Default)">4</Value>
     </Setting>
     <Setting Name="MaxRepeatServiceCalls" Type="System.Int32" Scope="Application">
@@ -21,4 +21,14 @@
       <Value Profile="(Default)">anonymous</Value>
     </Setting>
+    <Setting Name="EndpointConfigurationPriorities" Type="System.Collections.Specialized.StringCollection" Scope="Application">
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;string&gt;netTcpBinding_IHiveService&lt;/string&gt;
+  &lt;string&gt;wsHttpBinding_IHiveService&lt;/string&gt;
+&lt;/ArrayOfString&gt;</Value>
+    </Setting>
+    <Setting Name="MaxEndpointRetries" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
Index: /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/app.config
===================================================================
--- /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/app.config	(revision 9460)
+++ /branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/app.config	(revision 9461)
@@ -9,5 +9,5 @@
     <HeuristicLab.Clients.Hive.Settings>
       <setting name="MaxParallelUploads" serializeAs="String">
-        <value>1</value>
+        <value>16</value>
       </setting>
       <setting name="HLBinaryName" serializeAs="String">
@@ -18,5 +18,5 @@
       </setting>
       <setting name="MaxParallelDownloads" serializeAs="String">
-        <value>2</value>
+        <value>4</value>
       </setting>
       <setting name="MaxRepeatServiceCalls" serializeAs="String">
@@ -25,4 +25,16 @@
       <setting name="AnonymousUserName" serializeAs="String">
         <value>anonymous</value>
+      </setting>
+      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
+        <value>
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <string>netTcpBinding_IHiveService</string>
+            <string>wsHttpBinding_IHiveService</string>
+          </ArrayOfString>
+        </value>
+      </setting>
+      <setting name="MaxEndpointRetries" serializeAs="String">
+        <value>5</value>
       </setting>
     </HeuristicLab.Clients.Hive.Settings>
@@ -38,24 +50,6 @@
     <bindings>
       <wsHttpBinding>
-        <binding name="wsHttpBinding_Hive"
-                 closeTimeout="00:01:00"
-                 openTimeout="00:01:00"
-                 receiveTimeout="00:20:00"
-                 sendTimeout="00:20:00"
-                 bypassProxyOnLocal="false"
-                 transactionFlow="false"
-                 hostNameComparisonMode="StrongWildcard"
-                 maxBufferPoolSize="2147483647"
-                 maxReceivedMessageSize="2147483647"
-                 messageEncoding="Mtom"
-                 textEncoding="utf-8"
-                 useDefaultWebProxy="true"
-                 allowCookies="false">
-
-          <readerQuotas maxDepth="2147483647"
-                        maxStringContentLength="2147483647"
-                        maxArrayLength="2147483647"
-                        maxBytesPerRead="2147483647"
-                        maxNameTableCharCount="2147483647"/>
+        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
@@ -65,9 +59,24 @@
         </binding>
       </wsHttpBinding>
+      <netTcpBinding>
+        <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <security mode="TransportWithMessageCredential">
+            <transport clientCredentialType="Windows" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </netTcpBinding>
     </bindings>
     <client>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+      <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU="/>
+        </identity>
+      </endpoint>
+      <endpoint address="net.tcp://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
         </identity>
       </endpoint>
