Changeset 2904 for trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerApplication.cs

Timestamp:

03/01/10 21:20:01 (14 years ago)

Author:

kgrading

Message:

added functionality (#830)

File:

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

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

@@ -29 +29 @@
 using System.ServiceModel.Description;
 using System.Net;
+using HeuristicLab.Hive.Server.Core;
 using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.Hive.Server.Properties;
+using Spring.ServiceModel;
 
 namespace HeuristicLab.Hive.Server {
@@ -67 +69 @@
       string curServiceHost = "";
       Uri uriTcp;
-      IEnumerable<IClientFacade> clientCommunicatorInstances = ApplicationManager.Manager.GetInstances<IClientFacade>();
+      /*IEnumerable<IClientFacade> clientCommunicatorInstances = ApplicationManager.Manager.GetInstances<IClientFacade>();
       IEnumerable<IServerConsoleFacade> serverConsoleInstances = ApplicationManager.Manager.GetInstances<IServerConsoleFacade>();
-      IEnumerable<IExecutionEngineFacade> executionEngineInstances = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>();
-      ServiceHost serviceHost = null;
+      IEnumerable<IExecutionEngineFacade> executionEngineInstances = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>();*/
+      SpringServiceHost serviceHost = null;
       switch (svc) {
         case Services.ClientCommunicator:
-          if (clientCommunicatorInstances.Count() > 0) {
+        //  if (clientCommunicatorInstances.Count() > 0) {
             uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServer/");
-            serviceHost = new ServiceHost(clientCommunicatorInstances.First().GetType(), uriTcp);
+            //serviceHost = new ServiceHost(clientCommunicatorInstances.First().GetType(), uriTcp);
+            //serviceHost = new ServiceHost(typeof(ClientFacade), uriTcp);
+            serviceHost = new SpringServiceHost("clientFacade", uriTcp);
             serviceHost.AddServiceEndpoint(typeof(IClientFacade), streamedBinding, STR_ClientCommunicator);
             
@@ -88 +92 @@
 
             curServiceHost = STR_ClientCommunicator;
-          }
+        //  }
           break;
         case Services.ServerConsoleFacade:
-          if (serverConsoleInstances.Count() > 0) {
+        //  if (serverConsoleInstances.Count() > 0) {
             uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServerConsole/");
-            serviceHost = new ServiceHost(serverConsoleInstances.First().GetType(), uriTcp);
+            //serviceHost = new ServiceHost(serverConsoleInstances.First().GetType(), uriTcp);
+            serviceHost = new SpringServiceHost("serverConsoleFacade", uriTcp);
             serviceHost.AddServiceEndpoint(typeof(IServerConsoleFacade), binding, STR_ServerConsoleFacade);
             curServiceHost = STR_ServerConsoleFacade;
-          }
+        //  }
           break;
         case Services.ExecutionEngineFacade:
-          if (executionEngineInstances.Count() > 0) {
+        //  if (executionEngineInstances.Count() > 0) {
             uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/ExecutionEngine/");
-            serviceHost = new ServiceHost(executionEngineInstances.First().GetType(), uriTcp);
+            //serviceHost = new ServiceHost(executionEngineInstances.First().GetType(), uriTcp);
+            serviceHost = new SpringServiceHost("executionEngineFacade", uriTcp);
             serviceHost.AddServiceEndpoint(typeof(IExecutionEngineFacade), streamedBinding, STR_ExecutionEngineFacade);
             curServiceHost = STR_ExecutionEngineFacade;
-          }
+        //  }
           break;
         case Services.All:
@@ -111 +117 @@
           return null;
       }
-      if ((serviceHost != null) && (!String.IsNullOrEmpty(curServiceHost))) {
+      if (!String.IsNullOrEmpty(curServiceHost)) {
         AddMexEndpoint(serviceHost);
         //WcfSettings.SetServiceCertificate(serviceHost);