Changeset 4302 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

Timestamp:

08/24/10 15:31:35 (14 years ago)

Author:

cneumuel

Message:

• made ServerConsole work with wsHttpBinding
• applied role-base restrictions to all WCF-Services
• made wcf-services work with certificates
• renamed ExecutionEngineFacade to ClientFacade

(#1168)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs (modified) (2 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

@@ -90 +90 @@
 
         Logger.Debug("Creating the new connection proxy");
-        proxy = new SlaveFacadeClient(
-          HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
-          new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/SlaveCommunicator")
-        );
+        proxy = CreateSlaveFacadeClient();
         Logger.Debug("Created the new connection proxy");
 
@@ -122 +119 @@
         HandleNetworkError(ex);
       }
+    }
+
+    private SlaveFacadeClient CreateSlaveFacadeClient() {
+      //return new SlaveFacadeClient(
+      //  HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
+      //  new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/SlaveCommunicator")
+      //);
+      SlaveFacadeClient client = new SlaveFacadeClient("SlaveHttpEndpoint");
+      WcfSettings.SetEndpointAddress(client.Endpoint, string.Format("http://{0}:{1}/{2}", ServerIP, ServerPort, WcfSettings.SlaveServiceName));
+      return client;
     }