Changeset 8958 for branches/OaaS/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs

Timestamp:

11/28/12 10:02:01 (11 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.

File:

• branches/OaaS/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs (modified) (2 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