Changeset 1579 for trunk/sources/HeuristicLab.Hive.Server

Timestamp:

04/16/09 17:44:58 (15 years ago)

Author:

mbecirov

Message:

#528: WCF Service secured - you need to install the certificate in order to run the application properly!

File:

• trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerApplication.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerApplication.cs

@@ -36 +36 @@
       AutoRestart = true)]
   public class HiveServerApplication : ApplicationBase {
-    private const int DEFAULT_PORT = 9000;
     public const string STR_ClientCommunicator = "ClientCommunicator";
     public const string STR_ServerConsoleFacade = "ServerConsoleFacade";
@@ -43 +42 @@
     private DiscoveryService discService = new DiscoveryService();
     private Dictionary<string, ServiceHost> runningServices = new Dictionary<string, ServiceHost>();
-    private NetTcpBinding binding = new NetTcpBinding(SecurityMode.None, true);
-    //private WSHttpBinding binding = new WSHttpBinding(SecurityMode.TransportWithMessageCredential, true);
+    private NetTcpBinding binding = (NetTcpBinding)WcfSettings.GetBinding();
 
     private enum Services {
@@ -105 +103 @@
       if ((serviceHost != null) && (!String.IsNullOrEmpty(curServiceHost))) {
         AddMexEndpoint(serviceHost);
+        WcfSettings.SetServiceCertificate(serviceHost);
         serviceHost.Open();
         runningServices.Add(curServiceHost, serviceHost);
@@ -146 +145 @@
       Dictionary<string, Uri> baseAddrDict = new Dictionary<string, Uri>();
       baseAddrDict.Add(STR_ClientCommunicator,
-        StartService(Services.ClientCommunicator, addresses[index], DEFAULT_PORT));
+        StartService(Services.ClientCommunicator, addresses[index], WcfSettings.DEFAULTPORT));
       baseAddrDict.Add(STR_ServerConsoleFacade,
-        StartService(Services.ServerConsoleFacade, addresses[index], DEFAULT_PORT));
+        StartService(Services.ServerConsoleFacade, addresses[index], WcfSettings.DEFAULTPORT));
       baseAddrDict.Add(STR_ExecutionEngineFacade,
-        StartService(Services.ExecutionEngineFacade, addresses[index], DEFAULT_PORT));
+        StartService(Services.ExecutionEngineFacade, addresses[index], WcfSettings.DEFAULTPORT));
 
       ILifecycleManager[] lifecycleManagers =  discService.GetInstances<ILifecycleManager>();