Changeset 1602


Ignore:
Timestamp:
04/17/09 14:34:13 (12 years ago)
Author:
kgrading
Message:

refactoring (#547)

Location:
trunk/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj

    r1579 r1602  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>9.0.21022</ProductVersion>
     6    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</ProjectGuid>
     
    134134  </ItemGroup>
    135135  <ItemGroup>
     136    <None Include="app.config" />
    136137    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.Response.datasource" />
    137138    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseHB.datasource" />
     
    140141    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseResultReceived.datasource" />
    141142    <None Include="Service References\ServerService\Arrays1.xsd" />
    142     <None Include="Service References\ServerService\HeuristicLab.DataAccess1.xsd" />
     143    <None Include="Service References\ServerService\HeuristicLab.DataAccess.xsd" />
    143144    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" />
    144145    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts1.xsd" />
    145     <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure.xsd" />
     146    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure1.xsd" />
    146147    <None Include="Service References\ServerService\Reference.svcmap">
    147148      <Generator>WCF Proxy Generator</Generator>
  • trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

    r1589 r1602  
    205205
    206206        PluginManager.Manager.Initialize();
     207        //Todo: make a set & override the equals method
     208        List<byte[]> files = new List<byte[]>();
     209        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
     210          files.AddRange(plugininfo.PluginFiles);
    207211       
    208         AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine));
     212        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine), files);
    209213        appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
    210214        lock (engines) {                   
  • trunk/sources/HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs

    r1594 r1602  
    1010namespace HeuristicLab.Hive.Client.Core {
    1111  public class PluginCache {
     12
     13    private static PluginCache instance = null;
     14    public static PluginCache Instance {
     15      get {
     16        if (instance == null)
     17          instance = new PluginCache();
     18        return instance;
     19      }
     20    }
     21   
    1222    private List<CachedHivePluginInfo> pluginCache;
    1323   
     24
    1425    public PluginCache() {
    1526      pluginCache = new List<CachedHivePluginInfo>();
     
    2435      List<HivePluginInfo> missingPlugins = new List<HivePluginInfo>();
    2536      bool found = false;
     37     
     38      //Todo: Fix the whole equals thing here
    2639      foreach (HivePluginInfo info in requests) {
    2740        foreach (CachedHivePluginInfo cache in pluginCache) {
  • trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

    r1501 r1602  
    191191    }
    192192
    193     public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed, Type jobType) {
     193    public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed, Type jobType, ICollection<byte[]> assemblyFiles) {
    194194      PermissionSet pset;
    195195
     
    227227      NotifyListeners(PluginManagerAction.Initializing, "All plugins");
    228228
    229       if (depPlugins != null && depPlugins.Count > 0) {
    230         remoteRunner.LoadPlugins(depPlugins);
    231       }
     229      if (assemblyFiles != null && assemblyFiles.Count > 0)
     230        remoteRunner.LoadPlugins(assemblyFiles);
     231   
     232      //if (depPlugins != null && depPlugins.Count > 0) {       
     233      //  remoteRunner.LoadPlugins(depPlugins);
     234      //}
    232235      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
    233236      return applicationDomain;
Note: See TracChangeset for help on using the changeset viewer.