Changeset 4140 for branches/3.2/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs

Timestamp:

08/03/10 17:20:46 (14 years ago)

Author:

kgrading

Message:

#828 added various improvements to the plugin cache manager, the execution engine, the transaction handling on the serverside and the server console

File:

• branches/3.2/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs (modified) (1 diff)

branches/3.2/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs

@@ -94 +94 @@
       DefaultApplicationManager applicationManager =
         (DefaultApplicationManager)applicationDomain.CreateInstanceAndUnwrap(applicationManagerType.Assembly.FullName, applicationManagerType.FullName, true, BindingFlags.NonPublic | BindingFlags.Instance, null, null, null, null, null);
-      ApplicationDescription[] apps = ApplicationManager.Manager.Applications.Cast<ApplicationDescription>().ToArray();
-      PluginDescription[] plugins = ApplicationManager.Manager.Plugins.Cast<PluginDescription>().ToArray();
-      applicationManager.PrepareApplicationDomain(apps, plugins);
-      if (files != null && files.Count() > 0)
-        applicationManager.LoadAssemblies(files);
+      PluginManager pm = new PluginManager(name);
+      pm.DiscoverAndCheckPlugins();
+      ApplicationDescription[] apps = pm.Applications.Cast<ApplicationDescription>().ToArray();
+      PluginDescription[] plugins = pm.Plugins.Cast<PluginDescription>().ToArray();
+      applicationManager.PrepareApplicationDomain(apps, plugins);      
       return applicationDomain;
     }