Changeset 5707 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

Timestamp:

03/16/11 13:31:37 (13 years ago)

Author:

cneumuel

Message:

#1260

• some changes due to the removal of Disposable (r5706)
• copy PluginInfrastructure files into PluginCache folder in slaves (needed due to r5703)

File:

• branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Slave.Communication;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.PluginInfrastructure.Manager;
-using System.Threading;
-using System.Reflection;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -71 +71 @@
       if (!Directory.Exists(PluginCacheDir)) {
         Directory.CreateDirectory(PluginCacheDir);
+        string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        CopyPluginInfrastructureFiles(baseDir, PluginCacheDir);
       }
       pm.DiscoverAndCheckPlugins();
@@ -104 +106 @@
         // copy files from PluginInfrastructure, which are not declared
         string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-        CopyFile(baseDir, targetDir, "HeuristicLab.PluginInfrastructure-3.3.dll");
-        CopyFile(baseDir, targetDir, "ICSharpCode.SharpZipLib.dll");
-        CopyFile(baseDir, targetDir, "ICSharpCode.SharpZipLib License.txt");
+        CopyPluginInfrastructureFiles(baseDir, targetDir);
 
         // copy slave plugins, otherwise its not possible to register the UnhandledException handler to the appdomain
-        CopyFile(baseDir, targetDir, "HeuristicLab.Hive.Slave.Core-3.3.dll");
-        CopyFile(baseDir, targetDir, "HeuristicLab.Hive.Slave.Common-3.3.dll");
-        CopyFile(baseDir, targetDir, "HeuristicLab.Hive.Slave.Communication-3.3.dll");
-        CopyFile(baseDir, targetDir, "HeuristicLab.Hive.Slave.ExecutionEngine-3.3.dll");
-      }
+        CopySlaveFiles(baseDir, targetDir);
+      }
+    }
+
+    private void CopySlaveFiles(string sourceDir, String targetDir) {
+      CopyFile(sourceDir, targetDir, "HeuristicLab.Hive.Slave.Core-3.3.dll");
+      CopyFile(sourceDir, targetDir, "HeuristicLab.Hive.Slave.Common-3.3.dll");
+      CopyFile(sourceDir, targetDir, "HeuristicLab.Hive.Slave.Communication-3.3.dll");
+      CopyFile(sourceDir, targetDir, "HeuristicLab.Hive.Slave.ExecutionEngine-3.3.dll");
+    }
+
+    private void CopyPluginInfrastructureFiles(string sourceDir, String targetDir) {
+      CopyFile(sourceDir, targetDir, "HeuristicLab.PluginInfrastructure-3.3.dll");
+      CopyFile(sourceDir, targetDir, "ICSharpCode.SharpZipLib.dll");
+      CopyFile(sourceDir, targetDir, "ICSharpCode.SharpZipLib License.txt");
     }