Changeset 279 for branches/3.0/sources/HeuristicLab.PluginInfrastructure

Timestamp:

05/30/08 13:41:27 (16 years ago)

Author:

gkronber

Message:

merged changesets r219:r228, r240, r241:258, r263:265, r267,r268, r269 from trunk into the HL3 stable branch

Location:

branches/3.0/sources/HeuristicLab.PluginInfrastructure

Files:

• ApplicationInfo.cs (modified) (2 diffs)
• BaseClasses/ApplicationBase.cs (modified) (3 diffs)
• ClassInfoAttribute.cs (modified) (1 diff)
• Interfaces/IApplication.cs (modified) (1 diff)
• Loader.cs (modified) (1 diff)
• PluginManager.cs (modified) (1 diff)

branches/3.0/sources/HeuristicLab.PluginInfrastructure/ApplicationInfo.cs

@@ -46 +46 @@
     }
 
+    private bool autoRestart;
+    public bool AutoRestart {
+      get { return autoRestart; }
+      set { autoRestart = value; }
+    }
+
     private string pluginAssembly;
     /// <summary>
     /// Name of the assembly that contains the IApplication type.
-    /// NEEDED?
     /// </summary>
     public string PluginAssembly {
@@ -59 +64 @@
     /// <summary>
     /// Name of the type that implements the interface IApplication.
-    /// NEEDED?
     /// </summary>
     public string PluginType {

branches/3.0/sources/HeuristicLab.PluginInfrastructure/BaseClasses/ApplicationBase.cs

@@ -30 +30 @@
     private Version version;
     private string description;
-    
+    private bool autoRestart;
+
     public ApplicationBase() {
       ReadAttributes();
@@ -45 +46 @@
       // after the assertion we are sure that the array access will not fail
       ClassInfoAttribute pluginAttribute = (ClassInfoAttribute)pluginAttributes[0];
+      if(pluginAttribute != null) {
+        // if the plugin name is not explicitly set in the attribute then the default plugin name is the FullName of the type
+        if(pluginAttribute.Name != null) {
+          this.name = pluginAttribute.Name;
+        } else {
+          this.name = this.GetType().FullName;
+        }
 
-      // if the plugin name is not explicitly set in the attribute then the default plugin name is the FullName of the type
-      if(pluginAttribute != null && pluginAttribute.Name != null) {
-        this.name = pluginAttribute.Name;
-      } else {
-        this.name = this.GetType().FullName;
-      }
+        // if the version is not explicitly set in the attribute then the version of the assembly is used as default
+        if(pluginAttribute.Version != null) {
+          this.version = new Version(pluginAttribute.Version);
+        } else {
+          this.version = this.GetType().Assembly.GetName().Version;
+        }
 
-      // if the version is not explicitly set in the attribute then the version of the assembly is used as default
-      if(pluginAttribute != null && pluginAttribute.Version != null) {
-        this.version = new Version(pluginAttribute.Version);
-      } else {
-        this.version = this.GetType().Assembly.GetName().Version;
-      }
+        // if the description is not explicitly set in the attribute then the name of name of the application is used as default
+        if(pluginAttribute.Description != null) {
+          this.description = pluginAttribute.Description;
+        } else {
+          this.description = name;
+        }
 
-      // if the description is not explicitly set in the attribute then the name of name of the application is used as default
-      if(pluginAttribute != null && pluginAttribute.Description != null) {
-        this.description = pluginAttribute.Description;
-      } else {
-        this.description = name;
+        this.autoRestart = pluginAttribute.AutoRestart;
       }
     }
@@ -83 +87 @@
     }
 
-    public abstract void Run() ;
+    public bool AutoRestart {
+      get { return autoRestart; }
+    }
+
+    public abstract void Run();
 
     #endregion

branches/3.0/sources/HeuristicLab.PluginInfrastructure/ClassInfoAttribute.cs

@@ -52 +52 @@
     }
 
+    private bool autoRestart;
+    public bool AutoRestart {
+      get { return autoRestart; }
+      set { autoRestart = value; }
+    }
+
     public ClassInfoAttribute() {}
   }

branches/3.0/sources/HeuristicLab.PluginInfrastructure/Interfaces/IApplication.cs

@@ -29 +29 @@
     Version Version { get; }
     string Description { get;}
+    bool AutoRestart { get; }
     void Run();
   }

branches/3.0/sources/HeuristicLab.PluginInfrastructure/Loader.cs

@@ -120 +120 @@
         info.Version = application.Version;
         info.Description = application.Description;
+        info.AutoRestart = application.AutoRestart;
         info.PluginAssembly = application.GetType().Assembly.GetName().Name;
         info.PluginType = application.GetType().Namespace + "." + application.GetType().Name;

branches/3.0/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -103 +103 @@
       setup.PrivateBinPath = pluginDir;
       AppDomain applicationDomain = AppDomain.CreateDomain(appInfo.Name + " AppDomain", null, setup);
-
-      Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure.Runner");
-      NotifyListeners(PluginManagerAction.Initializing, "All plugins");
-      remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
-      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
-      remoteRunner.Run(appInfo);
-
-      AppDomain.Unload(applicationDomain);
+      try {
+        Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure.Runner");
+        NotifyListeners(PluginManagerAction.Initializing, "All plugins");
+        remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
+        NotifyListeners(PluginManagerAction.Initialized, "All plugins");
+        remoteRunner.Run(appInfo);
+      } catch(Exception ex) {
+        // can't handle exception here -> rethrow 
+        throw new ApplicationException("Exception in "+appInfo.Name, ex);
+      } finally {
+        // make sure domain is unloaded in all cases
+        AppDomain.Unload(applicationDomain);
+      }
     }