Changeset 1715


Ignore:
Timestamp:
04/30/09 13:07:31 (12 years ago)
Author:
kgrading
Message:

changed loading behavior back to byte array loading and removed dependency (#547)

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

    r1655 r1715  
    211211          files.AddRange(plugininfo.PluginFiles);
    212212       
    213         AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(Engine.HiveEngine), files);
     213        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
    214214        appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
    215215        lock (engines) {                   
  • trunk/sources/HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj

    r1655 r1715  
    143143      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    144144    </ProjectReference>
    145     <ProjectReference Include="..\..\HeuristicLab.Hive.Engine\3.2\HeuristicLab.Hive.Engine-3.2.csproj">
    146       <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
    147       <Name>HeuristicLab.Hive.Engine-3.2</Name>
    148     </ProjectReference>
    149145    <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.2\HeuristicLab.Hive.JobBase-3.2.csproj">
    150146      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
  • trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

    r1655 r1715  
    196196     
    197197
    198       DiscoveryService dService = new DiscoveryService();
     198      //DiscoveryService dService = new DiscoveryService();
    199199      //get the declaring plugin of the job
    200       PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
     200      //PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
    201201
    202202      //get all the plugins that have dependencies with the jobplugin
    203       List<PluginInfo> depPlugins = GetDependentPluginsRec(jobPlugin);
     203      //List<PluginInfo> depPlugins = GetDependentPluginsRec(jobPlugin);
    204204      //insert all jobs into one list
    205       depPlugins.Add(jobPlugin);
     205      //depPlugins.Add(jobPlugin);
    206206     
    207207      if (sandboxed) {
     
    211211        FileIOPermission fPerm = new FileIOPermission(PermissionState.None);
    212212             
    213         foreach (PluginInfo plugin in depPlugins) {
     213        /*foreach (PluginInfo plugin in depPlugins) {
    214214            foreach(String assemblies in plugin.Assemblies)
    215215              fPerm.AddPathList(FileIOPermissionAccess.AllAccess, assemblies);
    216216        }
    217217       
    218         pset.AddPermission(fPerm);
     218        pset.AddPermission(fPerm);*/
    219219
    220220      } else {
     
    229229      NotifyListeners(PluginManagerAction.Initializing, "All plugins");
    230230
    231       //if (assemblyFiles != null && assemblyFiles.Count > 0)
    232       //  remoteRunner.LoadPlugins(assemblyFiles);
     231      if (assemblyFiles != null && assemblyFiles.Count > 0)
     232        remoteRunner.LoadPlugins(assemblyFiles);
    233233     
    234       if (depPlugins != null && depPlugins.Count > 0) {       
     234      /*if (depPlugins != null && depPlugins.Count > 0) {       
    235235        remoteRunner.LoadPlugins(depPlugins);
    236       }
     236      }*/
    237237      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
    238238      return applicationDomain;
Note: See TracChangeset for help on using the changeset viewer.