Changeset 1715 for trunk

Timestamp:

04/30/09 13:07:31 (16 years ago)

Author:

kgrading

Message:

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

Location:

trunk/sources

Files:

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

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

@@ -211 +211 @@
           files.AddRange(plugininfo.PluginFiles);
         
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(Engine.HiveEngine), files);
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    

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

@@ -143 +143 @@
       <Name>HeuristicLab.Hive.Contracts-3.2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Engine\3.2\HeuristicLab.Hive.Engine-3.2.csproj">
-      <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
-      <Name>HeuristicLab.Hive.Engine-3.2</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.2\HeuristicLab.Hive.JobBase-3.2.csproj">
       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -196 +196 @@
       
 
-      DiscoveryService dService = new DiscoveryService();
+      //DiscoveryService dService = new DiscoveryService();
       //get the declaring plugin of the job
-      PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
+      //PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
 
       //get all the plugins that have dependencies with the jobplugin
-      List<PluginInfo> depPlugins = GetDependentPluginsRec(jobPlugin);
+      //List<PluginInfo> depPlugins = GetDependentPluginsRec(jobPlugin);
       //insert all jobs into one list
-      depPlugins.Add(jobPlugin);
+      //depPlugins.Add(jobPlugin);
       
       if (sandboxed) {
@@ -211 +211 @@
         FileIOPermission fPerm = new FileIOPermission(PermissionState.None);
              
-        foreach (PluginInfo plugin in depPlugins) {
+        /*foreach (PluginInfo plugin in depPlugins) {
             foreach(String assemblies in plugin.Assemblies)
               fPerm.AddPathList(FileIOPermissionAccess.AllAccess, assemblies);
         }
         
-        pset.AddPermission(fPerm);
+        pset.AddPermission(fPerm);*/
 
       } else {
@@ -229 +229 @@
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
 
-      //if (assemblyFiles != null && assemblyFiles.Count > 0)
-      //  remoteRunner.LoadPlugins(assemblyFiles);
+      if (assemblyFiles != null && assemblyFiles.Count > 0)
+        remoteRunner.LoadPlugins(assemblyFiles);
       
-      if (depPlugins != null && depPlugins.Count > 0) {        
+      /*if (depPlugins != null && depPlugins.Count > 0) {        
         remoteRunner.LoadPlugins(depPlugins);
-      }
+      }*/
       NotifyListeners(PluginManagerAction.Initialized, "All plugins");
       return applicationDomain;