Changeset 886 for trunk/sources

Timestamp:

12/02/08 19:42:00 (16 years ago)

Author:

kgrading

Message:

worked on #410

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/Core.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/Properties/AssemblyInfo.frame (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/Runner.cs (modified) (3 diffs)

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

@@ -89 +89 @@
       //clientCommunicator.LoginAsync(ConfigurationManager.GetInstance().GetClientInfo());
 
-      Heartbeat beat = new Heartbeat { Interval = 5000 };
+      Heartbeat beat = new Heartbeat { Interval = 30000 };
       beat.StartHeartbeat();     
 
@@ -154 +154 @@
       bool sandboxed = false;
 
-      AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed);
+      PluginManager.Manager.Initialize();
+      AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));
       
       appDomains.Add(e.Result.JobId, appDomain);

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -160 +160 @@
     }
 
-    public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed) {
+    public AppDomain CreateAndInitAppDomainWithSandbox(string friendlyName, bool sandboxed, Type jobType) {
 
       PermissionSet pset;
@@ -176 +176 @@
       Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap(typeof(Runner).Assembly.GetName().Name, typeof(Runner).FullName);
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
-      if (remoteLoader != null) {
-        remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
-      } else if (LoadedPlugins != null && LoadedPlugins.Count > 0) {
-        remoteRunner.LoadPlugins(LoadedPlugins);
+
+      DiscoveryService dService = new DiscoveryService();
+      PluginInfo jobPlugin = dService.GetDeclaringPlugin(jobType);
+
+      List<PluginInfo> depPlugins = GetDependentPlugins(jobPlugin);
+
+      if (depPlugins != null && depPlugins.Count > 0) {
+        remoteRunner.LoadPlugins(depPlugins);
       }
       NotifyListeners(PluginManagerAction.Initialized, "All plugins");

trunk/sources/HeuristicLab.PluginInfrastructure/Properties/AssemblyInfo.frame

@@ -24 +24 @@
 using System.Runtime.InteropServices;
 using HeuristicLab.PluginInfrastructure;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
@@ -36 +37 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AllowPartiallyTrustedCallers]
 
 // Setting ComVisible to false makes the types in this assembly not visible 

trunk/sources/HeuristicLab.PluginInfrastructure/Runner.cs

@@ -24 +24 @@
 using System.Text;
 using System.Reflection;
+using System.Security.Permissions;
+using System.Security;
 
 namespace HeuristicLab.PluginInfrastructure {
@@ -29 +31 @@
 
     public void LoadPlugins(ICollection<PluginInfo> plugins) {
+      //FileIOPermission fileperm = new FileIOPermission(FileIOPermissionAccess.AllAccess, @"C:\Program Files\HeuristicLab 3.0\plugins\");
+      //fileperm.Assert();
       foreach(PluginInfo pluginInfo in plugins) {
         foreach(string assemblyName in pluginInfo.Assemblies) {
@@ -34 +38 @@
         }
       }
+      //CodeAccessPermission.RevertAssert();
       PluginManager.Manager.LoadedPlugins = plugins;
     }