Changeset 6426

Timestamp:

06/16/11 12:39:32 (13 years ago)

Author:

ascheibe

Message:

#1233 removed useLocalPlugins

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/HiveClient.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/Plugin.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs (modified) (3 diffs)
• HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.Designer.cs (modified) (4 diffs)
• HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.cs (modified) (4 diffs)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Plugin.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

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

@@ -52 +52 @@
       this.jobsTabPage = new System.Windows.Forms.TabPage();
       this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveJobItemTreeView();
+      this.stateTabPage = new System.Windows.Forms.TabPage();
+      this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
@@ -62 +64 @@
       this.resourceIdsLabel = new System.Windows.Forms.Label();
       this.resourceNamesTextBox = new System.Windows.Forms.TextBox();
-      this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
       this.nameLabel = new System.Windows.Forms.Label();
       this.nameTextBox = new System.Windows.Forms.TextBox();
@@ -76 +77 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
-      this.stateTabPage = new System.Windows.Forms.TabPage();
-      this.stateLogViewHost = new ViewHost();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
+      this.stateTabPage.SuspendLayout();
       this.logTabPage.SuspendLayout();
       this.infoGroupBox.SuspendLayout();
-      this.stateTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -126 +125 @@
       this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
       // 
+      // stateTabPage
+      // 
+      this.stateTabPage.Controls.Add(this.stateLogViewHost);
+      this.stateTabPage.Location = new System.Drawing.Point(4, 22);
+      this.stateTabPage.Name = "stateTabPage";
+      this.stateTabPage.Size = new System.Drawing.Size(709, 426);
+      this.stateTabPage.TabIndex = 6;
+      this.stateTabPage.Text = "State";
+      this.stateTabPage.UseVisualStyleBackColor = true;
+      // 
+      // stateLogViewHost
+      // 
+      this.stateLogViewHost.Caption = "StateLog View";
+      this.stateLogViewHost.Content = null;
+      this.stateLogViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.stateLogViewHost.Enabled = false;
+      this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
+      this.stateLogViewHost.Name = "stateLogViewHost";
+      this.stateLogViewHost.ReadOnly = false;
+      this.stateLogViewHost.Size = new System.Drawing.Size(709, 426);
+      this.stateLogViewHost.TabIndex = 0;
+      this.stateLogViewHost.ViewsLabelVisible = true;
+      this.stateLogViewHost.ViewType = null;
+      // 
       // logTabPage
       // 
@@ -234 +257 @@
       this.resourceNamesTextBox.TabIndex = 14;
       this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
-      // 
-      // useLocalPluginsCheckBox
-      // 
-      this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.useLocalPluginsCheckBox.AutoSize = true;
-      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(469, 56);
-      this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
-      this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
-      this.useLocalPluginsCheckBox.TabIndex = 19;
-      this.useLocalPluginsCheckBox.Text = "UseLocalPlugins";
-      this.useLocalPluginsCheckBox.UseVisualStyleBackColor = true;
-      this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
       // 
       // nameLabel
@@ -370 +381 @@
       this.jobsLabel.TabIndex = 0;
       this.jobsLabel.Text = "Jobs:";
-      // 
-      // stateTabPage
-      // 
-      this.stateTabPage.Controls.Add(this.stateLogViewHost);
-      this.stateTabPage.Location = new System.Drawing.Point(4, 22);
-      this.stateTabPage.Name = "stateTabPage";
-      this.stateTabPage.Size = new System.Drawing.Size(709, 426);
-      this.stateTabPage.TabIndex = 6;
-      this.stateTabPage.Text = "State";
-      this.stateTabPage.UseVisualStyleBackColor = true;
-      // 
-      // stateLogViewHost
-      // 
-      this.stateLogViewHost.Caption = "StateLog View";
-      this.stateLogViewHost.Content = null;
-      this.stateLogViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
-      this.stateLogViewHost.Name = "stateLogViewHost";
-      this.stateLogViewHost.ReadOnly = false;
-      this.stateLogViewHost.Size = new System.Drawing.Size(709, 426);
-      this.stateLogViewHost.TabIndex = 0;
       // 
       // RefreshableHiveExperimentView
@@ -410 +400 @@
       this.Controls.Add(this.resourceIdsLabel);
       this.Controls.Add(this.stopButton);
-      this.Controls.Add(this.useLocalPluginsCheckBox);
       this.Controls.Add(this.resetButton);
       this.Name = "RefreshableHiveExperimentView";
@@ -416 +405 @@
       this.tabControl.ResumeLayout(false);
       this.jobsTabPage.ResumeLayout(false);
+      this.stateTabPage.ResumeLayout(false);
       this.logTabPage.ResumeLayout(false);
       this.infoGroupBox.ResumeLayout(false);
       this.infoGroupBox.PerformLayout();
-      this.stateTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -437 +426 @@
     private System.Windows.Forms.TabPage logTabPage;
     private Core.Views.LogView logView;
-    private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
     private System.Windows.Forms.TabPage jobsTabPage;
     private HiveJobItemTreeView jobsTreeView;

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

@@ -104 +104 @@
         executionTimeTextBox.Text = string.Empty;
         resourceNamesTextBox.Text = string.Empty;
-        useLocalPluginsCheckBox.Checked = false;
         isPrivilegedCheckBox.Checked = false;
         logView.Content = null;
@@ -113 +112 @@
         executionTimeTextBox.Text = Content.HiveExperiment.ExecutionTime.ToString();
         resourceNamesTextBox.Text = Content.HiveExperiment.ResourceNames;
-        useLocalPluginsCheckBox.Checked = Content.HiveExperiment.UseLocalPlugins;
         isPrivilegedCheckBox.Checked = Content.HiveExperiment.IsPrivileged;
         refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
@@ -141 +139 @@
         this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
 
-        this.isPrivilegedCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded); // TODO: check if user has the rights to do this
-        this.useLocalPluginsCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded);
+        this.isPrivilegedCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded); // TODO: check if user has the rights to do this        
         this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.HiveExperiment.ExecutionState == ExecutionState.Started;
         this.refreshButton.Enabled = Content.IsControllable && alreadyUploaded;
@@ -312 +309 @@
         Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
       }
-    }
-
-    private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (Content != null) Content.HiveExperiment.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
     }
 

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

@@ -71 +71 @@
         var plugins = new List<IPluginDescription>();
         PluginUtil.CollectDeclaringPlugins(plugins, types);
-        job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, new List<Plugin>(), new List<Plugin>(), plugins, false);
+        job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, new List<Plugin>(), new List<Plugin>(), plugins);
         return s.AddChildJob(parentJobId, job, jobData);
       });

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveClient.cs

@@ -219 +219 @@
           this.OnlinePlugins = service.GetPlugins();
           this.AlreadyUploadedPlugins = new List<Plugin>();
-          Plugin configFilePlugin = UploadConfigurationFile(service);
+          Plugin configFilePlugin = UploadConfigurationFile(service, onlinePlugins);
           this.alreadyUploadedPlugins.Add(configFilePlugin);
 
@@ -226 +226 @@
 
           foreach (HiveJob hiveJob in refreshableHiveExperiment.HiveExperiment.HiveJobs) {
-            UploadJobWithChildren(refreshableHiveExperiment.HiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.UseLocalPlugins, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log, refreshableHiveExperiment.HiveExperiment.IsPrivileged);
+            UploadJobWithChildren(refreshableHiveExperiment.HiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log, refreshableHiveExperiment.HiveExperiment.IsPrivileged);
           }
 
@@ -240 +240 @@
     /// Uploads the local configuration file as plugin
     /// </summary>
-    private static Plugin UploadConfigurationFile(IHiveService service) {
+    private static Plugin UploadConfigurationFile(IHiveService service, List<Plugin> onlinePlugins) {
       string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
       string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
@@ -251 +251 @@
       }
 
-      Plugin configPlugin = new Plugin() { Name = "Configuration", IsLocal = true, Version = new Version(), Hash = hash };
+      Plugin configPlugin = new Plugin() { Name = "Configuration", Version = new Version(), Hash = hash };
       PluginData configFile = new PluginData() { FileName = configFileName, Data = data };
-      configPlugin.Id = service.AddPlugin(configPlugin, new List<PluginData> { configFile });
-      return configPlugin;
+
+      IEnumerable<Plugin> onlineConfig = onlinePlugins.Where(p => p.Hash.SequenceEqual(hash));
+
+      if (onlineConfig.Count() > 0) {
+        return onlineConfig.First();
+      } else {
+        configPlugin.Id = service.AddPlugin(configPlugin, new List<PluginData> { configFile });
+        return configPlugin;
+      }
     }
 
@@ -264 +271 @@
     /// <param name="parentHiveJob">shall be null if its the root job</param>
     /// <param name="groups"></param>
-    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, bool useLocalPlugins, Guid hiveExperimentId, ILog log, bool isPrivileged) {
+    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, Guid hiveExperimentId, ILog log, bool isPrivileged) {
       jobCount++;
       progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
@@ -281 +288 @@
 
       TryAndRepeat(() => {
-        hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
+        hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins);
       }, -1, "Failed to upload plugins");
       hiveJob.Job.PluginsNeededIds.Add(configPluginId);
@@ -300 +307 @@
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, useLocalPlugins, hiveExperimentId, log, isPrivileged);
+        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, hiveExperimentId, log, isPrivileged);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -30 +30 @@
 namespace HeuristicLab.Clients.Hive {
   public partial class HiveExperiment : IDeepCloneable, IContent, IProgressReporter {
-    private bool useLocalPlugins;
-    public bool UseLocalPlugins {
-      get { return useLocalPlugins; }
-      set { useLocalPlugins = value; }
-    }
 
     private bool isPrivileged;
@@ -115 +110 @@
       this.Id = original.Id;
       this.HiveJobs = cloner.Clone(original.HiveJobs);
-      this.UseLocalPlugins = original.UseLocalPlugins;
       this.ExecutionTime = original.ExecutionTime;
       this.IsPrivileged = original.IsPrivileged;
@@ -213 +207 @@
       OnHiveJobsAdded(e);
     }
-    
+
     private void item_StateLogChanged(object sender, EventArgs e) {
       OnStateLogListChanged();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs

@@ -514 +514 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
-    private bool IsLocalField;
-
-    [System.Runtime.Serialization.OptionalFieldAttribute()]
     private System.Guid UserIdField;
 
@@ -544 +541 @@
           this.HashField = value;
           this.RaisePropertyChanged("Hash");
-        }
-      }
-    }
-
-    [System.Runtime.Serialization.DataMemberAttribute()]
-    public bool IsLocal {
-      get {
-        return this.IsLocalField;
-      }
-      set {
-        if ((this.IsLocalField.Equals(value) != true)) {
-          this.IsLocalField = value;
-          this.RaisePropertyChanged("IsLocal");
         }
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Plugin.cs

@@ -33 +33 @@
       this.UserId = original.UserId;
       this.DateCreated = original.DateCreated;
-      this.IsLocal = original.IsLocal;
     }
 
@@ -41 +40 @@
 
     public override string ToString() {
-      return string.Format("{0}-{1}", this.Name, this.Version.ToString()) + (this.IsLocal ? ", Local" : string.Empty);
+      return string.Format("{0}-{1}", this.Name, this.Version.ToString());
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs

@@ -38 +38 @@
     /// <param name="alreadyUploadedPlugins">List of plugins which have been uploaded from this HiveExperiment</param>
     /// <param name="neededPlugins">List of plugins which need to be uploaded</param>
-    /// <param name="useLocalPlugins">If true, the plugins which are already online are ignored. All local plugins are uploaded, but only once.</param>
     /// <returns></returns>
-    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins, bool useLocalPlugins) {
+    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
       var pluginIds = new List<Guid>();
       Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
@@ -55 +54 @@
           });
 
-          if (useLocalPlugins || foundPlugin == null) {
-            Plugin p = CreatePlugin(neededPlugin.Key, useLocalPlugins, neededPlugin.Value);
+          if (foundPlugin == null) {
+            Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
             List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
             try {
@@ -76 +75 @@
     }
 
-    private static Plugin CreatePlugin(IPluginDescription plugin, bool useLocalPlugins, byte[] hash) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version, IsLocal = useLocalPlugins, Hash = hash };
+    private static Plugin CreatePlugin(IPluginDescription plugin, byte[] hash) {
+      return new Plugin() { Name = plugin.Name, Version = plugin.Version, Hash = hash };
     }
 
-    public static Plugin CreatePlugin(IPluginDescription plugin, bool useLocalPlugins) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version, IsLocal = useLocalPlugins };
+    public static Plugin CreatePlugin(IPluginDescription plugin) {
+      return new Plugin() { Name = plugin.Name, Version = plugin.Version };
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.Designer.cs

@@ -38 +38 @@
       this.executionTimeLabel = new System.Windows.Forms.Label();
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
-      this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
       this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.tabControl.SuspendLayout();
@@ -180 +179 @@
       this.executionTimeTextBox.Size = new System.Drawing.Size(577, 20);
       this.executionTimeTextBox.TabIndex = 11;
-      // 
-      // useLocalPluginsCheckBox
-      // 
-      this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.useLocalPluginsCheckBox.AutoSize = true;
-      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(598, 55);
-      this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
-      this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
-      this.useLocalPluginsCheckBox.TabIndex = 12;
-      this.useLocalPluginsCheckBox.Text = "UseLocalPlugins";
-      this.useLocalPluginsCheckBox.UseVisualStyleBackColor = true;
-      this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
       // 
       // isPrivilegedCheckBox
@@ -210 +197 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.isPrivilegedCheckBox);
-      this.Controls.Add(this.useLocalPluginsCheckBox);
       this.Controls.Add(this.executionTimeTextBox);
       this.Controls.Add(this.executionTimeLabel);
@@ -243 +229 @@
     private System.Windows.Forms.Label executionTimeLabel;
     private System.Windows.Forms.TextBox executionTimeTextBox;
-    private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
     private HeuristicLab.Core.Views.LogView logView;
     private RefreshableHiveExperimentListView hiveExperimentListView;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.cs

@@ -73 +73 @@
         priorityTextBox.Text = string.Empty;
         executionTimeOnHiveTextBox.Text = string.Empty;
-        useLocalPluginsCheckBox.Checked = false;
         isPrivilegedCheckBox.Checked = false;
         hiveExperimentListView.Content = null;
@@ -81 +80 @@
         priorityTextBox.Text = Content.Priority.ToString();
         executionTimeOnHiveTextBox.Text = Content.ExecutionTimeOnHive.ToString();
-        useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
         isPrivilegedCheckBox.Checked = Content.IsPrivileged;
         hiveExperimentListView.Content = Content.HiveExperiments;
@@ -94 +92 @@
         resourceIdsTextBox.ReadOnly = this.ReadOnly;
         priorityTextBox.ReadOnly = this.ReadOnly;
-        useLocalPluginsCheckBox.Enabled = !this.ReadOnly;
         isPrivilegedCheckBox.Enabled = !this.ReadOnly; // TODO: check for user rights
       } else {
         resourceIdsTextBox.ReadOnly = false;
         priorityTextBox.ReadOnly = false;
-        useLocalPluginsCheckBox.Enabled = false;
         isPrivilegedCheckBox.Enabled = false;
       }
     }
-    
+
     #region Event Handlers (child controls)
     private void resourceIdsTextBox_Validated(object sender, EventArgs e) {
@@ -111 +107 @@
     private void priorityTextBox_Validated(object sender, EventArgs e) {
       Content.Priority = int.Parse(priorityTextBox.Text);
-    }
-
-    private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
-      Content.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -68 +68 @@
 
     [Storable]
-    private bool useLocalPlugins;
-    public bool UseLocalPlugins {
-      get { return useLocalPlugins; }
-      set { useLocalPlugins = value; }
-    }
-
-    [Storable]
     private bool isPrivileged;
     public bool IsPrivileged {
@@ -114 +107 @@
       this.priority = original.priority;
       this.executionTimeOnHive = original.executionTimeOnHive;
-      this.useLocalPlugins = original.useLocalPlugins;
       this.IsPrivileged = original.IsPrivileged;
       // this.hiveExperiments = cloner.Clone(original.hiveExperiments); do not clone hiveExperiments - otherwise they would be sent with every job
@@ -149 +141 @@
       if (firstRun) {
         TaskScheduler.UnobservedTaskException += new EventHandler<UnobservedTaskExceptionEventArgs>(TaskScheduler_UnobservedTaskException);
-        this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins()).Where(x => x.IsLocal == false).ToList();
+        this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins()).Where(x => x.Hash != null).ToList();
         this.AlreadyUploadedPlugins = new List<Plugin>();
         firstRun = false;
@@ -338 +330 @@
         hiveExperiment.Name = "HiveEngine Run " + hiveExperiments.Count;
         hiveExperiment.DateCreated = DateTime.Now;
-        hiveExperiment.UseLocalPlugins = this.UseLocalPlugins;
         hiveExperiment.ResourceNames = this.ResourceNames;
         hiveExperiment.IsPrivileged = this.IsPrivileged;

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

@@ -37 +37 @@
 
     [DataMember]
-    public bool IsLocal { get; set; }
-
-    [DataMember]
     public byte[] Hash { get; set; }
 

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

@@ -167 +167 @@
     public static DT.Plugin ToDto(Plugin source) {
       if (source == null) return null;
-      return new DT.Plugin { Id = source.PluginId, Name = source.Name, Version = new Version(source.Version), UserId = source.UserId, IsLocal = source.IsLocal, DateCreated = source.DateCreated, Hash = source.Hash };
+      return new DT.Plugin { Id = source.PluginId, Name = source.Name, Version = new Version(source.Version), UserId = source.UserId, DateCreated = source.DateCreated, Hash = source.Hash };
     }
     public static Plugin ToEntity(DT.Plugin source) {
@@ -176 +176 @@
     public static void ToEntity(DT.Plugin source, Plugin target) {
       if ((source != null) && (target != null)) {
-        target.PluginId = source.Id; target.Name = source.Name; target.Version = source.Version.ToString(); target.UserId = source.UserId; target.IsLocal = source.IsLocal; target.DateCreated = source.DateCreated; target.Hash = source.Hash;
+        target.PluginId = source.Id; target.Name = source.Name; target.Version = source.Version.ToString(); target.UserId = source.UserId; target.DateCreated = source.DateCreated; target.Hash = source.Hash;
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml

@@ -14 +14 @@
       <Column Name="Name" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
       <Column Name="Version" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
-      <Column Name="IsLocal" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
       <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
       <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime" CanBeNull="false" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout

@@ -9 +9 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="7d998e56-4fba-41ca-a1a8-1dcdb9068edf" absoluteBounds="8.875, 5.5, 2, 2.1554996744791666">
+    <classShape Id="7d998e56-4fba-41ca-a1a8-1dcdb9068edf" absoluteBounds="8.875, 5.5, 2, 1.9631982421874996">
       <DataClassMoniker Name="/HiveDataContext/Plugin" />
       <nestedChildShapes>
-        <elementListCompartment Id="ec4ba325-6dff-4418-baad-59af81ae2024" absoluteBounds="8.89, 5.9600000000000009, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="ec4ba325-6dff-4418-baad-59af81ae2024" absoluteBounds="8.89, 5.9600000000000009, 1.9700000000000002, 1.4031982421875" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -76 +76 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.84780160677083); (8.875 : 4.84780160677083)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.84780160677083); (8.875 : 4.84780160677083)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
       <nodes>
@@ -116 +116 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(10.875 : 6.28929768880208); (11.25 : 6.28929768880208)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(10.875 : 6.28929768880208); (11.25 : 6.28929768880208)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_PluginData" />
       <nodes>
@@ -130 +130 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.875 : 6.19314697265625); (8.5 : 6.19314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(8.875 : 6.19314697265625); (8.5 : 6.19314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_RequiredPlugin" />
       <nodes>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs

@@ -438 +438 @@
     private string _Version;
     
-    private bool _IsLocal;
-    
     private System.Guid _UserId;
     
@@ -460 +458 @@
     partial void OnVersionChanging(string value);
     partial void OnVersionChanged();
-    partial void OnIsLocalChanging(bool value);
-    partial void OnIsLocalChanged();
     partial void OnUserIdChanging(System.Guid value);
     partial void OnUserIdChanged();
@@ -533 +529 @@
           this.SendPropertyChanged("Version");
           this.OnVersionChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLocal", DbType="Bit")]
-    public bool IsLocal
-    {
-      get
-      {
-        return this._IsLocal;
-      }
-      set
-      {
-        if ((this._IsLocal != value))
-        {
-          this.OnIsLocalChanging(value);
-          this.SendPropertyChanging();
-          this._IsLocal = value;
-          this.SendPropertyChanged("IsLocal");
-          this.OnIsLocalChanged();
         }
       }

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

@@ -98 +98 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       //trans.UseTransaction(() => { // cneumuel: try without transaction
-        jobData.LastUpdate = DateTime.Now;
-        dao.UpdateJob(job);
-        dao.UpdateJobData(jobData);
+      jobData.LastUpdate = DateTime.Now;
+      dao.UpdateJob(job);
+      dao.UpdateJobData(jobData);
       //}, false, true);
     }
@@ -285 +285 @@
         plugin.UserId = author.UserId;
         plugin.DateCreated = DateTime.Now;
-        if (!plugin.IsLocal) {
-          var existing = dao.GetPlugins(x => x.Hash != null && !x.IsLocal).Where(x => x.Hash.SequenceEqual(plugin.Hash));
-
-          if (existing.Count() > 0) {
-            // a plugin with the same name and version already exists.
-            throw new FaultException<PluginAlreadyExistsFault>(new PluginAlreadyExistsFault(existing.Single().Id));
-          }
-        }
+
+        var existing = dao.GetPlugins(x => x.Hash != null).Where(x => x.Hash.SequenceEqual(plugin.Hash));
+        if (existing.Count() > 0) {
+          // a plugin already exists.
+          throw new FaultException<PluginAlreadyExistsFault>(new PluginAlreadyExistsFault(existing.Single().Id));
+        }
+
         Guid pluginId = dao.AddPlugin(plugin);
         foreach (PluginData pluginData in pluginDatas) {
@@ -309 +308 @@
     public IEnumerable<Plugin> GetPlugins() {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      return dao.GetPlugins(x => x.IsLocal == false);
+      return dao.GetPlugins(x => x.Hash != null);
     }