Changeset 8958 for branches/OaaS/HeuristicLab.PluginInfrastructure

Timestamp:

11/28/12 10:02:01 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added a administrator web interface for job management
• Fixed Hive Client (PluginValidator) to find the assemblies within the right directories
• Reorganized controller classes (Folders HL, Interfaces, Azure)
• You may now successfully schedule and run jobs with the web ui.

Location:

branches/OaaS/HeuristicLab.PluginInfrastructure/3.3

Files:

• Manager/PluginValidator.cs (modified) (2 diffs)
• WebApplicationManager.cs (modified) (4 diffs)

branches/OaaS/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs

@@ -488 +488 @@
     }
 
+    private string AssemblyDirectory(Assembly assem) {
+      string codeBase = assem.CodeBase;
+      UriBuilder uri = new UriBuilder(codeBase);
+      string path = Uri.UnescapeDataString(uri.Path);
+      return Path.GetFullPath(path);      
+    }
+
 
     private bool IsAnyDependencyDisabled(PluginDescription descr, List<PluginDescription> disabledPlugins) {
@@ -512 +519 @@
             try {
               string assemblyName = (from assembly in AppDomain.CurrentDomain.ReflectionOnlyGetAssemblies()
-                                     where string.Equals(Path.GetFullPath(assembly.Location), Path.GetFullPath(assemblyLocation), StringComparison.CurrentCultureIgnoreCase)
+                                     where string.Equals(Path.GetFullPath(assembly.Location), Path.GetFullPath(assemblyLocation), StringComparison.CurrentCultureIgnoreCase) ||
+                                           string.Equals(AssemblyDirectory(assembly), Path.GetFullPath(assemblyLocation), StringComparison.CurrentCultureIgnoreCase)
                                      select assembly.FullName).Single();
               // now load the assemblies into the execution context  

branches/OaaS/HeuristicLab.PluginInfrastructure/3.3/WebApplicationManager.cs

@@ -88 +88 @@
     }
 
+    static private string AssemblyDirectory {
+      get {
+        string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+        UriBuilder uri = new UriBuilder(codeBase);
+        string path = Uri.UnescapeDataString(uri.Path);
+        return Path.GetDirectoryName(path);
+      }
+    }
     // find all types implementing IPlugin in the reflectionOnlyAssemblies and create a list of plugin descriptions
     // the dependencies in the plugin descriptions are not yet set correctly because we need to create
@@ -93 +101 @@
     private List<PluginDescription> GatherPluginDescriptions()
     {
-      List<PluginDescription> pluginDescriptions = new List<PluginDescription>();
-      foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+      /*List<PluginDescription> pluginDescriptions = new List<PluginDescription>();
+
+      // load all assemblies that are available in the project folders
+      var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
+      IList<string> loadedPaths = new List<string>();
+      foreach (var asm in loadedAssemblies) {
+        try {
+          loadedPaths.Add(asm.Location);
+        }
+        catch (Exception ex) {
+        }
+      }*/
+      /*var assembliePaths = from location in loadedAssemblies                           
+                           select location.Location;
+
+      var loadedPaths = loadedAssemblies.Select(a => a.Location).ToArray();*/
+      var pv = new PluginValidator() { PluginDir = AssemblyDirectory };
+      pv.DiscoverAndCheckPlugins();
+      return pv.Plugins.ToList();
+      /*var pluginManager = new PluginManager(AssemblyDirectory);
+      pluginManager.DiscoverAndCheckPlugins();
+      return pluginManager.Plugins.ToList();*/
+
+      /*var referencedPaths = Directory.GetFiles(AssemblyDirectory, "*.dll");
+      var toLoad = referencedPaths.Where(r => !loadedPaths.Contains(r, StringComparer.InvariantCultureIgnoreCase)).ToList();
+      toLoad.ForEach(path => loadedAssemblies.Add(AppDomain.CurrentDomain.Load(AssemblyName.GetAssemblyName(path))));
+      
+      foreach (Assembly assembly in loadedAssemblies)
       {
         // GetExportedTypes throws FileNotFoundException when a referenced assembly
@@ -106 +140 @@
                                            where !t.IsAbstract && t.GetInterfaces().Any(x => x.AssemblyQualifiedName == typeof(IPlugin).AssemblyQualifiedName)
                                            select GetPluginDescription(t);
+
+          // TODO: Also load all plugin descriptors from assemblies liying in the app domain folder!!!!!
           pluginDescriptions.AddRange(assemblyPluginDescriptions);
         }
@@ -122 +158 @@
         }
       }
-      return pluginDescriptions;
+      return pluginDescriptions;*/
     }