Changeset 2591 for trunk/sources/HeuristicLab.Grid.HiveBridge

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.Grid.HiveBridge/3.2

Files:

• HeuristicLabGridHiveBridgePlugin.cs (modified) (1 diff)
• HiveGridServerWrapper.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HeuristicLabGridHiveBridgePlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Grid.HiveBridge {
-  [ClassInfo(Name = "HeuristicLab.Grid.HiveBridge-3.2")]
-  [PluginFile(Filename = "HeuristicLab.Grid.HiveBridge-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Grid-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Hive.Contracts-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Hive.JobBase-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Hive.Engine-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
+  [Plugin("HeuristicLab.Grid.HiveBridge-3.2")]
+  [PluginFile("HeuristicLab.Grid.HiveBridge-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Grid-3.2")]
+  [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
+  [PluginDependency("HeuristicLab.Hive.JobBase-3.2")]
+  [PluginDependency("HeuristicLab.Hive.Engine-3.2")]
+  [PluginDependency("HeuristicLab.Tracing-3.2")]
   public class HeuristicLabGridPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs

@@ -131 +131 @@
       stream.Close();
 
-      DiscoveryService service = new DiscoveryService();
-      List<PluginInfo> plugins = new List<PluginInfo>();
+      List<IPluginDescription> plugins = new List<IPluginDescription>();
 
       foreach (IStorable storeable in dictionary.Values) {
-        PluginInfo pluginInfo = service.GetDeclaringPlugin(storeable.GetType());
+        IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
         if (!plugins.Contains(pluginInfo)) {
           plugins.Add(pluginInfo);
@@ -144 +143 @@
       }
 
-      foreach (PluginInfo uniquePlugin in plugins) {
+      foreach (IPluginDescription uniquePlugin in plugins) {
         HivePluginInfo pluginInfo =
           new HivePluginInfo();