Changeset 1602 for trunk/sources

Timestamp:

04/17/09 14:34:13 (16 years ago)

Author:

kgrading

Message:

refactoring (#547)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</ProjectGuid>
@@ -134 +134 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.Response.datasource" />
     <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseHB.datasource" />
@@ -140 +141 @@
     <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseResultReceived.datasource" />
     <None Include="Service References\ServerService\Arrays1.xsd" />
-    <None Include="Service References\ServerService\HeuristicLab.DataAccess1.xsd" />
+    <None Include="Service References\ServerService\HeuristicLab.DataAccess.xsd" />
     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" />
     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts1.xsd" />
-    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure.xsd" />
+    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure1.xsd" />
     <None Include="Service References\ServerService\Reference.svcmap">
       <Generator>WCF Proxy Generator</Generator>

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -205 +205 @@
 
         PluginManager.Manager.Initialize();
+        //Todo: make a set & override the equals method
+        List<byte[]> files = new List<byte[]>();
+        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
+          files.AddRange(plugininfo.PluginFiles);
         
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine));
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine), files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs

@@ -10 +10 @@
 namespace HeuristicLab.Hive.Client.Core {
   public class PluginCache {
+
+    private static PluginCache instance = null;
+    public static PluginCache Instance {
+      get {
+        if (instance == null)
+          instance = new PluginCache();
+        return instance;
+      }
+    } 
+    
     private List<CachedHivePluginInfo> pluginCache;
     
+
     public PluginCache() {
       pluginCache = new List<CachedHivePluginInfo>();
@@ -24 +35 @@
       List<HivePluginInfo> missingPlugins = new List<HivePluginInfo>();
       bool found = false;
+      
+      //Todo: Fix the whole equals thing here
       foreach (HivePluginInfo info in requests) {
         foreach (CachedHivePluginInfo cache in pluginCache) {

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -191 +191 @@
     }
 
-    public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed, Type jobType) {
+    public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed, Type jobType, ICollection<byte[]> assemblyFiles) {
       PermissionSet pset;
 
@@ -227 +227 @@
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
 
-      if (depPlugins != null && depPlugins.Count > 0) {
-        remoteRunner.LoadPlugins(depPlugins);
-      }
+      if (assemblyFiles != null && assemblyFiles.Count > 0)
+        remoteRunner.LoadPlugins(assemblyFiles);
+    
+      //if (depPlugins != null && depPlugins.Count > 0) {        
+      //  remoteRunner.LoadPlugins(depPlugins);
+      //}
       NotifyListeners(PluginManagerAction.Initialized, "All plugins");
       return applicationDomain;