Changeset 5458 for branches

Timestamp:

02/14/11 18:23:37 (14 years ago)

Author:

cneumuel

Message:

#1233

• removed GetConfigurationFile from service -> configuration is now submitted as a plugin with one file (the configuration file)
• resource ids are now checked before uploading a hive experiment, only valid resource names are accepted
• added SharpZipLib License to ConsoleClient project, so dependecies are satisfied

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/ICSharpCode.SharpZipLib License.txt (added)
• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs (modified) (10 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.4/Exceptions/ResourceNotFoundException.cs (added)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs (modified) (16 diffs)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperiment.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj

@@ -82 +82 @@
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="ICSharpCode.SharpZipLib License.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs

@@ -231 +231 @@
     }
 
+    public Guid GetResourceId(string resourceName) {
+      // todo
+      return Guid.Empty;
+    }
+
     #endregion
 
@@ -324 +329 @@
     }
     #endregion
+
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -402 +402 @@
       String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString());
       bool pluginsPrepared = false;
+      string configFileName = string.Empty;
 
       try {
-        PluginCache.Instance.PreparePlugins(myJob, jobData);
+        PluginCache.Instance.PreparePlugins(myJob, out configFileName);
         ClientCom.LogMessage("Plugins fetched for job " + myJob.Id);
         pluginsPrepared = true;
@@ -414 +415 @@
       if (pluginsPrepared) {
         try {
-          AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, PluginCache.ConfigFileName));
+          AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
           appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           lock (engines) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs

@@ -34 +34 @@
   public class PluginCache {
     private static object locker = new object();
-    public const string ConfigFileName = "Sandbox.config";
     private const string lastUsedFileName = "lastUsed.dat";
 
@@ -52 +51 @@
           instance = new PluginCache();
         return instance;
-      }
-    }
-
-    public string ConfigFilePath {
-      get {
-        return Path.Combine(PluginCacheDir, ConfigFileName);
       }
     }
@@ -83 +76 @@
 
       foreach (string dir in Directory.EnumerateDirectories(PluginCacheDir)) {
-        cachedPluginsGuids.Add(Guid.Parse(getFilenameFromPath(dir)));
+        cachedPluginsGuids.Add(Guid.Parse(getFilenameFromPath(dir))); // Todo: cleaner solution to getFilenameFromPath
       }
     }
 
     [MethodImpl(MethodImplOptions.Synchronized)]
-    public void CopyPluginsForJob(List<Plugin> requests, Guid jobId) {
+    public void CopyPluginsForJob(List<Plugin> requests, Guid jobId, out string configFileName) {
       lock (locker) {
+        configFileName = string.Empty;
         String targetDir = Path.Combine(PluginTempBaseDir, jobId.ToString());
 
@@ -97 +91 @@
         Directory.CreateDirectory(targetDir);
 
-
         foreach (Plugin requestedPlugin in requests) {
-          string curPath = Path.Combine(PluginCacheDir, requestedPlugin.Id.ToString());
-          if (Directory.Exists(curPath)) {
-            writeDateLastUsed(curPath);
-
-            foreach (string file in Directory.GetFiles(curPath)) {
-              string fn = getFilenameFromPath(file);
-              if (fn != lastUsedFileName)
-                File.Copy(file, Path.Combine(targetDir, fn));
-            }
-          }
-        }
-
-        // copy config file
-        File.Copy(ConfigFilePath, Path.Combine(targetDir, ConfigFileName));
-
-        // copy files from PluginInfrastructure, which are not declared
+          var filePaths = GetPluginFilePaths(requestedPlugin.Id);
+          foreach (string filePath in filePaths) {
+            File.Copy(filePath, Path.Combine(targetDir, Path.GetFileName(filePath)));
+          }
+
+          if (requestedPlugin.Name == "Configuration") {
+            configFileName = Path.Combine(targetDir, Path.GetFileName(filePaths.SingleOrDefault())); // configuration plugin consists only of 1 file (usually the "HeuristicLab X.X.exe.config")
+          }
+        }
+
+        // copy files from PluginInfrastructure (which are not declared in any plugins)
         string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         CopyFile(baseDir, targetDir, "HeuristicLab.PluginInfrastructure-3.3.dll");
@@ -137 +125 @@
 
     [MethodImpl(MethodImplOptions.Synchronized)]
-    internal void PreparePlugins(Job myJob, JobData jobData) {
+    internal void PreparePlugins(Job myJob, out string configFileName) {
       lock (locker) {
         SlaveClientCom.Instance.ClientCom.LogMessage("Fetching plugins for job");
@@ -174 +162 @@
         localPlugins.AddRange(missingPlugins);
 
-        IEnumerable<PluginData> updateablePlugins = WcfService.Instance.GetPluginDatas(missingGuids);
-
-        foreach (PluginData updateablePlugin in updateablePlugins) {
-          string pluginDir = Path.Combine(PluginCacheDir, updateablePlugin.PluginId.ToString());
+        IEnumerable<PluginData> pluginDatas = WcfService.Instance.GetPluginDatas(missingGuids);
+
+        foreach (PluginData pluginData in pluginDatas) {
+          string pluginDir = Path.Combine(PluginCacheDir, pluginData.PluginId.ToString());
 
           //put all files belonging to a plugin in the same directory
@@ -183 +171 @@
             DirectoryInfo di = Directory.CreateDirectory(pluginDir);
           }
-          File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(updateablePlugin.FileName)), updateablePlugin.Data);
-        }
-
-        PluginData configFile = WcfService.Instance.GetConfigurationFile();
-        File.WriteAllBytes(ConfigFilePath, configFile.Data);
+          File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(pluginData.FileName)), pluginData.Data);
+        }
 
         DoUpdateRun();
-        CopyPluginsForJob(requiredPlugins, myJob.Id);
+        CopyPluginsForJob(requiredPlugins, myJob.Id, out configFileName);
+      }
+    }
+
+    /// <summary>
+    /// Returns a list of files which belong to a plugin from the plugincache
+    /// </summary>
+    private IEnumerable<string> GetPluginFilePaths(Guid pluginId) {
+      string pluginPath = Path.Combine(PluginCacheDir, pluginId.ToString());
+
+      if (Directory.Exists(pluginPath)) {
+        WriteDateLastUsed(pluginPath);
+        foreach (string filePath in Directory.GetFiles(pluginPath)) {
+          string fn = Path.GetFileName(filePath);
+          if (fn != lastUsedFileName)
+            yield return filePath;
+        }
       }
     }
@@ -198 +199 @@
     /// this can later be used to find plugins which are outdated
     /// </summary>    
-    private void writeDateLastUsed(string path) {
+    private void WriteDateLastUsed(string path) {
       FileStream fs = new FileStream(Path.Combine(path, lastUsedFileName), FileMode.Create);
       BinaryFormatter formatter = new BinaryFormatter();
@@ -218 +219 @@
     /// </summary>
     /// <param name="path"></param>
-    private void cleanPluginCache() {
+    private void CleanPluginCache() {
       FileStream fs = null;
       DateTime luDate;
@@ -274 +275 @@
         SlaveClientCom.Instance.ClientCom.LogMessage("failed while unloading " + id + " with exception " + ex);
       }
-      cleanPluginCache();
+      CleanPluginCache();
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

@@ -238 +238 @@
     }
 
-    public PluginData GetConfigurationFile() {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          PluginData msg = service.Obj.GetConfigurationFile();
-          return msg;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
-      }
-    }
-
     private static Disposable<IHiveService> GetSlaveService() {
       return ServiceLocator.Instance.GetService("hiveslave", "hiveslave");

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs

@@ -63 +63 @@
       this.pauseButton = new System.Windows.Forms.Button();
       this.resourceIdsLabel = new System.Windows.Forms.Label();
-      this.resourceIdsTextBox = new System.Windows.Forms.TextBox();
+      this.resourceNamesTextBox = new System.Windows.Forms.TextBox();
       this.disconnectButton = new System.Windows.Forms.Button();
       this.reconnectButton = new System.Windows.Forms.Button();
@@ -289 +289 @@
       // resourceIdsTextBox
       // 
-      this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.resourceIdsTextBox.Location = new System.Drawing.Point(72, 52);
-      this.resourceIdsTextBox.Name = "resourceIdsTextBox";
-      this.resourceIdsTextBox.Size = new System.Drawing.Size(559, 20);
-      this.resourceIdsTextBox.TabIndex = 14;
-      this.resourceIdsTextBox.Validated += new System.EventHandler(this.resourceIdsTextBox_Validated);
+      this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.resourceNamesTextBox.Location = new System.Drawing.Point(72, 52);
+      this.resourceNamesTextBox.Name = "resourceIdsTextBox";
+      this.resourceNamesTextBox.Size = new System.Drawing.Size(559, 20);
+      this.resourceNamesTextBox.TabIndex = 14;
+      this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
       // 
       // disconnectButton
@@ -364 +364 @@
       this.Controls.Add(this.disconnectButton);
       this.Controls.Add(this.startButton);
-      this.Controls.Add(this.resourceIdsTextBox);
+      this.Controls.Add(this.resourceNamesTextBox);
       this.Controls.Add(this.executionTimeTextBox);
       this.Controls.Add(this.resourceIdsLabel);
@@ -385 +385 @@
       this.Controls.SetChildIndex(this.resourceIdsLabel, 0);
       this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
-      this.Controls.SetChildIndex(this.resourceIdsTextBox, 0);
+      this.Controls.SetChildIndex(this.resourceNamesTextBox, 0);
       this.Controls.SetChildIndex(this.startButton, 0);
       this.Controls.SetChildIndex(this.disconnectButton, 0);
@@ -413 +413 @@
     private System.Windows.Forms.Button pauseButton;
     private System.Windows.Forms.Label resourceIdsLabel;
-    private System.Windows.Forms.TextBox resourceIdsTextBox;
+    private System.Windows.Forms.TextBox resourceNamesTextBox;
     private System.Windows.Forms.Button viewExperimentButton;
     private Core.Views.NamedItemView experimentNamedItemView;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs

@@ -83 +83 @@
       if (Content == null) {
         executionTimeTextBox.Text = string.Empty;
-        resourceIdsTextBox.Text = string.Empty;
+        resourceNamesTextBox.Text = string.Empty;
         useLocalPluginsCheckBox.Checked = false;
         logView.Content = null;
       } else {
         executionTimeTextBox.Text = Content.ExecutionTime.ToString();
-        resourceIdsTextBox.Text = Content.ResourceIds;
+        resourceNamesTextBox.Text = Content.ResourceNames;
         useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
         logView.Content = Content.Log;
@@ -104 +104 @@
         this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
-        this.resourceIdsTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
+        this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.hiveJobView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.useLocalPluginsCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared;
@@ -214 +214 @@
     }
 
-    private void resourceIdsTextBox_Validated(object sender, EventArgs e) {
-      Content.ResourceIds = resourceIdsTextBox.Text;
+    private void resourceNamesTextBox_Validated(object sender, EventArgs e) {
+      Content.ResourceNames = resourceNamesTextBox.Text;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs

@@ -38 +38 @@
   using HeuristicLab.PluginInfrastructure;
   using System.IO;
+  using System.Configuration;
+  using System.Reflection;
+  using HeuristicLab.PluginInfrastructure.Manager;
 
   /// <summary>
@@ -76 +79 @@
     }
 
-    private string resourceIds;
-    public string ResourceIds {
-      get { return resourceIds; }
+    private string resourceNames;
+    public string ResourceNames {
+      get { return resourceNames; }
       set {
-        if (resourceIds != value) {
-          resourceIds = value;
-          OnResourceIdsChanged();
+        if (resourceNames != value) {
+          resourceNames = value;
+          OnResourceNamesChanged();
         }
       }
@@ -117 +120 @@
     public IEnumerable<Plugin> OnlinePlugins {
       get { return onlinePlugins; }
-      set { onlinePlugins = value; } 
+      set { onlinePlugins = value; }
     }
 
@@ -131 +134 @@
       set { useLocalPlugins = value; }
     }
-    
-    public HiveExperimentClient() : base(itemName, itemDescription) {
-      // TODO //this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
-      this.ResourceIds = "HEAL";
+
+    public HiveExperimentClient()
+      : base(itemName, itemDescription) {
+      this.ResourceNames = "HEAL";
       this.log = new Log();
       InitTimer();
     }
-    public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto) : this() {
+    public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto)
+      : this() {
       UpdateFromDto(hiveExperimentDto);
     }
     protected HiveExperimentClient(HiveExperimentClient original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceIds = original.resourceIds;
+      this.ResourceNames = original.resourceNames;
       this.ExecutionState = original.executionState;
       this.ExecutionTime = original.executionTime;
@@ -158 +162 @@
       this.Name = hiveExperimentDto.Name;
       this.Description = hiveExperimentDto.Description;
-      // TODO: this.ResourceIds = hiveExperimentDto.ResourceIds;
+      this.ResourceNames = hiveExperimentDto.ResourceNames;
       this.rootJobId = hiveExperimentDto.RootJobId;
     }
@@ -167 +171 @@
         Name = this.Name,
         Description = this.Description,
-        //ResourceIds = this.ResourceIds,
+        ResourceNames = this.ResourceNames,
         RootJobId = this.rootJobId
       };
@@ -227 +231 @@
 
     public void Prepare() {
-      // do nothing
+      this.timer.Stop();
+      this.ExecutionState = Core.ExecutionState.Prepared;
+      this.ExecutionTime = TimeSpan.Zero;
     }
 
     public void Start() {
       OnStarted();
-      ExecutionTime = new TimeSpan();
+      ExecutionTime = TimeSpan.Zero;
       lastUpdateTime = DateTime.Now;
       this.ExecutionState = Core.ExecutionState.Started;
@@ -246 +252 @@
         IsProgressing = true;
         using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
-          IEnumerable<string> groups = ToResourceIdList(this.ResourceIds);
+          IEnumerable<string> resourceNames = ToResourceNameList(this.ResourceNames);
+          var resourceIds = new List<Guid>();
+          foreach (var resourceName in resourceNames) {
+            Guid resourceId = service.Obj.GetResourceId(resourceName);
+            if (resourceId == Guid.Empty) {
+              throw new ResourceNotFoundException(string.Format("Could not find the resource '{0}'", resourceName));
+            }
+            resourceIds.Add(resourceId);
+          }
+
           this.HiveJob.SetIndexInParentOptimizerList(null);
 
@@ -255 +270 @@
           this.OnlinePlugins = service.Obj.GetPlugins();
           this.AlreadyUploadedPlugins = new List<Plugin>();
+          Plugin configFilePlugin = UploadConfigurationFile(service.Obj);
+          this.alreadyUploadedPlugins.Add(configFilePlugin);
 
           this.progress.Status = "Uploading jobs...";
-          UploadJobWithChildren(service.Obj, this.HiveJob, null, groups, ref jobCount, totalJobCount);
+          UploadJobWithChildren(service.Obj, this.HiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id);
           this.rootJobId = this.HiveJob.Job.Id;
           LogMessage("Finished sending jobs to hive");
@@ -272 +289 @@
       catch (Exception e) {
         OnExceptionOccured(e);
+        this.Prepare();
       }
       finally {
         IsProgressing = false;
       }
+    }
+
+    /// <summary>
+    /// Uploads the local configuration file as plugin
+    /// </summary>
+    private static Plugin UploadConfigurationFile(IHiveService service) {
+      string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
+      string configFileName = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
+
+      Plugin configPlugin = new Plugin() {
+        Name = "Configuration",
+        IsLocal = true,
+        Version = new Version()
+      };
+      PluginData configFile = new PluginData() {
+        FileName = configFileName,
+        Data = File.ReadAllBytes(configFileName)
+      };
+      configPlugin.Id = service.AddPlugin(configPlugin, new List<PluginData> { configFile });
+      return configPlugin;
     }
 
@@ -286 +324 @@
     /// <param name="parentHiveJob">shall be null if its the root job</param>
     /// <param name="groups"></param>
-    private void UploadJobWithChildren(IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<string> groups, ref int jobCount, int totalJobCount) {
+    private void UploadJobWithChildren(IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId) {
       jobCount++;
       this.progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
@@ -301 +339 @@
 
       hiveJob.Job.PluginsNeededIds = GetPluginDependencies(service, onlinePlugins, alreadyUploadedPlugins, plugins, useLocalPlugins);
+      hiveJob.Job.PluginsNeededIds.Add(configPluginId);
 
       this.progress.Status = string.Format("Uploading job {0} of {1} ({2} kb)", jobCount, totalJobCount, jobData.Data.Count() / 1024);
@@ -306 +345 @@
 
       if (parentHiveJob != null) {
-        //response = service.AddChildJob(parentHiveJob.Job.Id, serializedJob);
         hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, jobData);
       } else {
-        // response = service.AddJobWithGroupStrings(serializedJob, groups);
-        hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, null); // todo: use ResourceIds
+        hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, groups);
       }
 
@@ -316 +353 @@
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-        UploadJobWithChildren(service, child, hiveJob, groups, ref jobCount, totalJobCount);
-      }
-    }
-    
+        UploadJobWithChildren(service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId);
+      }
+    }
+
     /// <summary>
     /// Converts a string which can contain Ids separated by ';' to a enumerable
     /// </summary>
-    private IEnumerable<string> ToResourceIdList(string resourceGroups) {
+    private IEnumerable<string> ToResourceNameList(string resourceGroups) {
       if (!string.IsNullOrEmpty(resourceGroups)) {
-        return resourceIds.Split(';');
+        return resourceNames.Split(';');
       } else {
         return new List<string>();
@@ -395 +432 @@
     }
 
-    public event EventHandler ResourceIdsChanged;
-    protected virtual void OnResourceIdsChanged() {
-      EventHandler handler = ResourceIdsChanged;
+    public event EventHandler ResourceNamesChanged;
+    protected virtual void OnResourceNamesChanged() {
+      EventHandler handler = ResourceNamesChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -649 +686 @@
       }
     }
-    #endregion 
+    #endregion
 
     #region Plugin Management

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -102 +102 @@
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -118 +119 @@
     <Compile Include="Exceptions\OptimizerNotFoundException.cs" />
     <Compile Include="ExperimentManager\PluginClient.cs" />
+    <Compile Include="Exceptions\ResourceNotFoundException.cs" />
     <Compile Include="IServiceLocator.cs" />
     <Compile Include="Jobs\OptimizerJob.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperiment.cs

@@ -34 +34 @@
     [DataMember]
     public DateTime DateCreated { get; set; }
+    [DataMember]
+    public string ResourceNames { get; set; }
 
     public HiveExperiment() { }
@@ -40 +42 @@
       this.UserId = original.UserId;
       this.DateCreated = original.DateCreated;
+      this.ResourceNames = original.ResourceNames;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

@@ -40 +40 @@
     [OperationContract]
     void DeleteChildJobs(Guid parentJobId);
-
-    [OperationContract]
-    PluginData GetConfigurationFile();
 
     #endregion
@@ -133 +130 @@
     void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId);
 
+    [OperationContract]
+    Guid GetResourceId(string resourceName);
+
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs

@@ -94 +94 @@
     public static DT.HiveExperiment ToDto(HiveExperiment source) {
       if (source == null) return null;
-      return new DT.HiveExperiment { Id = source.HiveExperimentId, Description = source.Description, Name = source.Name, RootJobId = source.RootJobId, UserId = source.UserId, DateCreated = source.DateCreated };
+      return new DT.HiveExperiment { Id = source.HiveExperimentId, Description = source.Description, Name = source.Name, RootJobId = source.RootJobId, UserId = source.UserId, DateCreated = source.DateCreated, ResourceNames = source.ResourceIds };
     }
     public static HiveExperiment ToEntity(DT.HiveExperiment source) {
@@ -103 +103 @@
     public static void ToEntity(DT.HiveExperiment source, HiveExperiment target) {
       if ((source != null) && (target != null)) {
-        target.HiveExperimentId = source.Id; target.Description = source.Description; target.Name = source.Name; target.RootJobId = source.RootJobId; target.UserId = source.UserId; target.DateCreated = source.DateCreated;
+        target.HiveExperimentId = source.Id; target.Description = source.Description; target.Name = source.Name; target.RootJobId = source.RootJobId; target.UserId = source.UserId; target.DateCreated = source.DateCreated; target.ResourceIds = source.ResourceNames;
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -103 +103 @@
       }
     }
-    
-    public PluginData GetConfigurationFile() {
-      using (trans.OpenTransaction()) {
-        //TODO: move filename to app.config
-        PluginData configFile = dao.GetPluginDatas(x => x.FileName == "HeuristicLab 3.3.exe.config").SingleOrDefault();
-        if (configFile == null) {
-          //TODO: error handling
-          return null;
-        } else {
-          return configFile;
-        }
-      }
-    }
 
     #endregion
@@ -300 +287 @@
     }
 
+    public Guid GetResourceId(string resourceName) {
+      using (trans.OpenTransaction()) {
+        var resource = dao.GetResources(x => x.Name == resourceName).FirstOrDefault();
+        if (resource != null) {
+          return resource.Id;
+        } else {
+          return Guid.Empty;
+        }
+      }
+    }
     #endregion
 
@@ -322 +319 @@
     #endregion
 
+
   }
 }