Changeset 2591 for trunk/sources/HeuristicLab.Grid

Timestamp:

01/05/10 10:31:40 (15 years ago)

Author:

gkronber

Message:

Copied refactored plugin infrastructure from branch and merged changeset r2586:2589 from branch into the trunk. #799

Location:

trunk/sources/HeuristicLab.Grid/3.2

Files:

• GridClient.cs (modified) (1 diff)
• GridClientApplication.cs (modified) (1 diff)
• GridServerApplication.cs (modified) (1 diff)
• HeuristicLabGridPlugin.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Grid/3.2/GridClient.cs

@@ -134 +134 @@
         if(gotEngine && !stopped) {
           executing = true;
-          AppDomain engineDomain = PluginManager.Manager.CreateAndInitAppDomain("Engine domain");
+          AppDomain engineDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox("Engine domain");
           Type engineRunnerType = typeof(EngineRunner);
           

trunk/sources/HeuristicLab.Grid/3.2/GridClientApplication.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Grid {
-  [ClassInfo(Name = "Grid Client", Description="Client application for the distributed engine grid.", AutoRestart = true)]
+  [Application("Grid Client", "Client application for the distributed engine grid.", true)]
   class GridClientApplication : ApplicationBase {
     public override void Run() {

trunk/sources/HeuristicLab.Grid/3.2/GridServerApplication.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Grid {
-  [ClassInfo(Name = "Grid Server", Description = "Server application for the distributed engine grid.", AutoRestart=true)]
+  [Application("Grid Server", "Server application for the distributed engine grid.", true)]
   class GridServerApplication : ApplicationBase {
     public override void Run() {

trunk/sources/HeuristicLab.Grid/3.2/HeuristicLabGridPlugin.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Grid {
-  [ClassInfo(Name = "HeuristicLab.Grid-3.2")]
-  [PluginFile(Filename = "HeuristicLab.Grid-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
+  [Plugin("HeuristicLab.Grid-3.2")]
+  [PluginFile("HeuristicLab.Grid-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Tracing-3.2")]
   public class HeuristicLabGridPlugin : PluginBase {
   }