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

Timestamp:

01/05/10 10:31:40 (15 years ago)

Author:

gkronber

Message:

Copied refactored plugin infrastructure from branch and merged changeset r2586:2589 from branch into the trunk. #799

Location:

trunk/sources/HeuristicLab.Hive.Server/3.2

Files:

• HiveServerApplication.cs (modified) (9 diffs)
• HiveServerPlugin.cs (modified) (1 diff)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
@@ -33 +34 @@
 
 namespace HeuristicLab.Hive.Server {
-  [ClassInfo(Name = "Hive Server",
-      Description = "Server application for the distributed hive engine.",
-      AutoRestart = true)]
+  [Application("Hive Server", "Server application for the distributed hive engine.", true)]
   public class HiveServerApplication : ApplicationBase {
     public const string STR_ClientCommunicator = "ClientCommunicator";
@@ -41 +40 @@
     public const string STR_ExecutionEngineFacade = "ExecutionEngineFacade";
 
-    private DiscoveryService discService = new DiscoveryService();
     private Dictionary<string, ServiceHost> runningServices = new Dictionary<string, ServiceHost>();
     private NetTcpBinding binding = (NetTcpBinding)WcfSettings.GetBinding();
@@ -52 +50 @@
       All
     }
-    
+
     private bool AddMexEndpoint(ServiceHost serviceHost) {
       if (serviceHost != null) {
@@ -69 +67 @@
       string curServiceHost = "";
       Uri uriTcp;
-      IClientFacade[] clientCommunicatorInstances = discService.GetInstances<IClientFacade>();
-      IServerConsoleFacade[] serverConsoleInstances = discService.GetInstances<IServerConsoleFacade>();
-      IExecutionEngineFacade[] executionEngineInstances = discService.GetInstances<IExecutionEngineFacade>();
+      IEnumerable<IClientFacade> clientCommunicatorInstances = ApplicationManager.Manager.GetInstances<IClientFacade>();
+      IEnumerable<IServerConsoleFacade> serverConsoleInstances = ApplicationManager.Manager.GetInstances<IServerConsoleFacade>();
+      IEnumerable<IExecutionEngineFacade> executionEngineInstances = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>();
       ServiceHost serviceHost = null;
       switch (svc) {
         case Services.ClientCommunicator:
-          if (clientCommunicatorInstances.Length > 0) {
-            uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServer/"); 
-            serviceHost = new ServiceHost(clientCommunicatorInstances[0].GetType(), uriTcp);
+          if (clientCommunicatorInstances.Count() > 0) {
+            uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServer/");
+            serviceHost = new ServiceHost(clientCommunicatorInstances.First().GetType(), uriTcp);
             serviceHost.AddServiceEndpoint(typeof(IClientFacade), streamedBinding, STR_ClientCommunicator);
             curServiceHost = STR_ClientCommunicator;
@@ -83 +81 @@
           break;
         case Services.ServerConsoleFacade:
-          if (serverConsoleInstances.Length > 0) {
+          if (serverConsoleInstances.Count() > 0) {
             uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServerConsole/");
-            serviceHost = new ServiceHost(serverConsoleInstances[0].GetType(), uriTcp);
+            serviceHost = new ServiceHost(serverConsoleInstances.First().GetType(), uriTcp);
             serviceHost.AddServiceEndpoint(typeof(IServerConsoleFacade), binding, STR_ServerConsoleFacade);
             curServiceHost = STR_ServerConsoleFacade;
@@ -91 +89 @@
           break;
         case Services.ExecutionEngineFacade:
-          if (executionEngineInstances.Length > 0) {
+          if (executionEngineInstances.Count() > 0) {
             uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/ExecutionEngine/");
-            serviceHost = new ServiceHost(executionEngineInstances[0].GetType(), uriTcp);
+            serviceHost = new ServiceHost(executionEngineInstances.First().GetType(), uriTcp);
             serviceHost.AddServiceEndpoint(typeof(IExecutionEngineFacade), streamedBinding, STR_ExecutionEngineFacade);
             curServiceHost = STR_ExecutionEngineFacade;
@@ -143 +141 @@
             break;
       }
-      
+
       //Start services and record their base address
       Dictionary<string, Uri> baseAddrDict = new Dictionary<string, Uri>();
@@ -153 +151 @@
         StartService(Services.ExecutionEngineFacade, addresses[index], WcfSettings.DEFAULTPORT));
 
-      ILifecycleManager[] lifecycleManagers =  discService.GetInstances<ILifecycleManager>();
-      if (lifecycleManagers.Length > 0) {
+      IEnumerable<ILifecycleManager> lifecycleManagers = ApplicationManager.Manager.GetInstances<ILifecycleManager>();
+      if (lifecycleManagers.Count() > 0) {
         ILifecycleManager lifecycleManager =
-          lifecycleManagers[0];
+          lifecycleManagers.First();
 
         lifecycleManager.Init();
         Form mainForm = new MainForm(baseAddrDict);
         Application.Run(mainForm);
-        
+
         lifecycleManager.Shutdown();
       }

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Hive.Server {
-  [ClassInfo(Name = "HeuristicLab.Hive.Server-3.2")]
-  [PluginFile(Filename = "HeuristicLab.Hive.Server-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Hive.Contracts-3.2")]
+  [Plugin("HeuristicLab.Hive.Server-3.2")]
+  [PluginFile("HeuristicLab.Hive.Server-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
   public class HiveServerPlugin : PluginBase {
   }