Changeset 5511

Timestamp:

02/17/11 14:47:56 (13 years ago)

Author:

cneumuel

Message:

#1233

• added StateLog to log state transitions of hive jobs
• added permissions to hive experiments (in data access layer, no UI for that yet)
• extended unit tests

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs (modified) (6 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperiment.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperimentPermission.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Job.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/JobState.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/LightweightJob.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Permission.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/StateLog.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/HeuristicLab.Services.Hive.Common-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/Logger.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified) (6 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml (modified) (6 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout (modified) (12 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs (modified) (31 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Interfaces/IHiveDao.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Tools/CreateHiveDatabaseApplication.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/Tools/prepareHiveDatabase.sql (modified) (2 diffs)
• HeuristicLab.Services.Hive.Tests/DaoTests.cs (modified) (5 diffs)
• HeuristicLab.Services.Hive.Tests/ServiceTests.cs (modified) (9 diffs)
• HeuristicLab.Services.Hive.Web/Hive-3.4/App_Code/HiveServerModule.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/AuthorizationManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.4/Interfaces/IAuthorizationManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/LifecycleManager.cs (modified) (4 diffs)

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

@@ -154 +154 @@
     }
 
-    public void UpdateJob(Job jobDto, JobData jobDataDto) {
+    public void UpdateJob(Job jobDto) {
       Console.WriteLine("Update Job called!");
+      ResultJobs.Add(jobDto);
+    }
+
+    public void UpdateJobData(Job jobDto, JobData jobDataDto) {
+      Console.WriteLine("Update JobData called!");
       ResultJobDatas.Add(jobDataDto);
       ResultJobs.Add(jobDto);
@@ -174 +179 @@
       if (curJobIdx < jobs.Count) {
         var job = jobs[curJobIdx];
-        job.SlaveId = slaveId;
+        // job.SlaveId = slaveId; // commented out because of change to StateLog
         curJobIdx++;
         return job;

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

@@ -76 +76 @@
     [TestMethod]
     public void TestSingleJob() {
-      Job testJob = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
+      Job testJob = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob.SetState(JobState.Waiting);
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob);
@@ -113 +114 @@
     [TestMethod]
     public void TestShutdownSlaveWhileJobRunning() {
-      Job testJob = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
+      Job testJob = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob.SetState(JobState.Waiting);
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob);
@@ -173 +175 @@
     [TestMethod]
     public void TestTwoJobs() {
-      Job testJob1 = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
-      Job testJob2 = new Job { Id = Guid.NewGuid(), JobState = JobState.Waiting, DateCreated = DateTime.Now, CoresNeeded = 1, MemoryNeeded = 0 };
+      Job testJob1 = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob1.SetState(JobState.Waiting);
+      Job testJob2 = new Job { Id = Guid.NewGuid(), CoresNeeded = 1, MemoryNeeded = 0 };
+      testJob2.SetState(JobState.Waiting);
       List<Job> jobList = new List<Job>();
       jobList.Add(testJob1);

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

@@ -185 +185 @@
         engines[job.Id].Pause();
         JobData sJob = engines[job.Id].GetFinishedJob();
-        job.Exception = engines[job.Id].CurrentException;
+        // job.Exception = engines[job.Id].CurrentException; // can there be an exception if a job is paused
         job.ExecutionTime = engines[job.Id].ExecutionTime;
 
         try {
           ClientCom.LogMessage("Sending the paused job with id: " + job.Id);
-          wcfService.UpdateJob(job, sJob);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id);
           SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
         }
@@ -208 +208 @@
         engines[job.Id].Stop();
         JobData sJob = engines[job.Id].GetFinishedJob();
-        job.Exception = engines[job.Id].CurrentException;
+        // job.Exception = engines[job.Id].CurrentException; // can there be an exception if a job is stopped regularly
         job.ExecutionTime = engines[job.Id].ExecutionTime;
 
         try {
           ClientCom.LogMessage("Sending the stoppped job with id: " + job.Id);
-          wcfService.UpdateJob(job, sJob);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id);
           SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
         }
@@ -345 +345 @@
       } else {
         Job job = Jobs[data.JobId];
-        job.JobState = JobState.WaitingForChildJobs;
-        wcfService.UpdateJob(job, data);
+        job.SetState(JobState.Transferring);
+        wcfService.UpdateJobData(job, data, ConfigManager.Instance.GetClientInfo().Id);
+        job.SetState(JobState.Waiting); // todo: what if it was a ResumeOnChildJobsFinished job before? maybe look into StateLog
+        wcfService.UpdateJob(job);
       }
       KillAppDomain(data.JobId);
@@ -372 +374 @@
         cJob.ExecutionTime = engines[jobId].ExecutionTime;
 
-        JobData sJob = engines[jobId].GetFinishedJob();
-        cJob.Exception = engines[jobId].CurrentException;
-        cJob.ExecutionTime = engines[jobId].ExecutionTime;
+        JobData sJob = engines[jId].GetFinishedJob();
+        // cJob.Exception = engines[jId].CurrentException; // can there be an exception if the job is sent normally. the exception should be entered in the statelog with the corresponding state (Failed)
+        cJob.ExecutionTime = engines[jId].ExecutionTime;
 
         try {
           ClientCom.LogMessage("Sending the finished job with id: " + jobId);
-          wcfService.UpdateJob(cJob, sJob);
+          wcfService.UpdateJobData(cJob, sJob, ConfigManager.Instance.GetClientInfo().Id);
           SlaveStatusInfo.JobsProcessed++;
         }

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

@@ -128 +128 @@
 
       Job childJob = new Job();
-      childJob.JobState = JobState.Offline;
+      childJob.SetState(JobState.Offline);
       childJob.CoresNeeded = 1;
       childJob.MemoryNeeded = 0;

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Clients.Common;
-using HeuristicLab.Clients.Hive.Slave.Properties;
 using HeuristicLab.Common;
 using HeuristicLab.Services.Hive.Common;
@@ -141 +140 @@
     }
 
+    public void UpdateJob(Job job) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
+        try {
+          service.Obj.UpdateJob(job);
+        }
+        catch (Exception ex) {
+          HandleNetworkError(ex);
+        }
+      }
+    }
+
     /// <summary>
     /// used on pause or if job finished to upload the job results
@@ -146 +156 @@
     /// <param name="job"></param>
     /// <param name="jobData"></param>    
-    public void UpdateJob(Job job, JobData jobData) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          service.Obj.UpdateJob(job, jobData);
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
-      }
-    }
-
+    public void UpdateJobData(Job job, JobData jobData, Guid slaveId) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
+        try {
+          JobState before = job.State;
+          job.SetState(JobState.Transferring, slaveId, "");
+          service.Obj.UpdateJob(job);
+
+          service.Obj.UpdateJobData(job, jobData);
+
+          job.SetState(before, slaveId, "");
+          service.Obj.UpdateJob(job);
+        }
+        catch (Exception ex) {
+          HandleNetworkError(ex);
+        }
+      }
+    }
+    
     public List<MessageContainer> SendHeartbeat(Heartbeat heartbeat) {
       using (Disposable<IHiveService> service = GetSlaveService()) {

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

@@ -127 +127 @@
       } else {
         if (Content != null && Content.Job != null) {
-          this.stateTextBox.Text = Content.Job.JobState.ToString();
+          this.stateTextBox.Text = Content.Job.State.ToString();
           this.executionTimeTextBox.Text = Content.Job.ExecutionTime.ToString();
-          this.dateCalculatedText.Text = Content.Job.DateCalculated.ToString();
+          //this.dateCalculatedText.Text = Content.Job.DateCalculated.ToString();
           this.dateFinishedTextBox.Text = Content.Job.DateFinished.ToString();
-          this.exceptionTextBox.Text = Content.Job.Exception;
+          this.exceptionTextBox.Text = Content.Job.CurrentStateLog.Exception;
         } else {
           this.stateTextBox.Text = string.Empty;

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

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
+using HeuristicLab.Clients.Common;
+using HeuristicLab.Clients.Hive.Jobs;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
+using HeuristicLab.Services.Hive.Common;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using HeuristicLab.Tracing;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Clients.Hive.Jobs;
-using HeuristicLab.Clients.Common;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Clients.Hive {
+  using System.Configuration;
+  using System.IO;
+  using HeuristicLab.PluginInfrastructure;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.PluginInfrastructure;
-  using System.IO;
-  using System.Configuration;
-  using System.Reflection;
-  using HeuristicLab.PluginInfrastructure.Manager;
 
   /// <summary>
@@ -301 +299 @@
     private static Plugin UploadConfigurationFile(IHiveService service) {
       string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
-      string configFileName = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
+      string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
 
       Plugin configPlugin = new Plugin() {
@@ -331 +329 @@
       if (hiveJob.OptimizerJob.ComputeInParallel &&
         (hiveJob.OptimizerJob.Optimizer is Optimization.Experiment || hiveJob.OptimizerJob.Optimizer is Optimization.BatchRun)) {
-        hiveJob.Job.JobState = JobState.WaitingForChildJobs;
+        hiveJob.Job.SetState(JobState.FinishOnChildJobsFinished);
         hiveJob.OptimizerJob.CollectChildJobs = false; // don't collect child-jobs on slaves
         jobData = hiveJob.GetAsJobData(true, out plugins);
@@ -522 +520 @@
         if (hj != null) {
           hj.UpdateFromLightweightJob(lightweightJob);
-          if ((hj.Job.JobState == JobState.Aborted ||
-               hj.Job.JobState == JobState.Failed ||
-               hj.Job.JobState == JobState.Finished) &&
+          if ((hj.Job.State == JobState.Aborted ||
+               hj.Job.State == JobState.Failed ||
+               hj.Job.State == JobState.Finished) &&
               !hj.IsFinishedOptimizerDownloaded) {
             LogMessage(hj.Job.Id, "Downloading optimizer for job");

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Clients.Hive.Jobs;
@@ -32 +31 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab.Clients.Hive {
@@ -45 +43 @@
           return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         } else {
-          if (job.JobState == JobState.Waiting) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-          else if (job.JobState == JobState.WaitingForChildJobs) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-          else if (job.JobState == JobState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-          else if (job.JobState == JobState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-          else if (job.JobState == JobState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
-          else if (job.JobState == JobState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          if (job.State == JobState.Waiting) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (job.State == JobState.FinishOnChildJobsFinished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (job.State == JobState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
+          else if (job.State == JobState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          else if (job.State == JobState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
+          else if (job.State == JobState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
           else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         }
@@ -108 +106 @@
     public HiveJob() {
       this.Job = new Job() {
-        JobState = JobState.Offline,
-        DateCreated = DateTime.Now,
         CoresNeeded = 1,
         MemoryNeeded = 0
       };
+      job.SetState(JobState.Offline);
       this.childHiveJobs = new ItemList<HiveJob>();
       syncJobsWithOptimizers = true;
@@ -406 +403 @@
       if (lightweightJob != null) {
         job.Id = lightweightJob.Id;
-        job.DateCreated = lightweightJob.DateCreated;
-        job.DateCalculated = lightweightJob.DateCalculated;
-        job.DateFinished = lightweightJob.DateFinished;
-        job.Exception = lightweightJob.Exception;
         job.Id = lightweightJob.Id;
         job.ExecutionTime = lightweightJob.ExecutionTime;
-        job.JobState = lightweightJob.JobState;
+        job.StateLog = new List<StateLog>(lightweightJob.StateLog);
         // what about parentJob
         OnJobStateChanged();
@@ -488 +481 @@
     public event EventHandler JobStateChanged;
     private void OnJobStateChanged() {
-      LogMessage("JobStateChanged (State: " + this.Job.JobState + ", ExecutionTime: " + this.Job.ExecutionTime.ToString() + ")");
+      LogMessage("JobStateChanged (State: " + this.Job.State + ", ExecutionTime: " + this.Job.ExecutionTime.ToString() + ")");
       EventHandler handler = JobStateChanged;
       if (handler != null) handler(this, EventArgs.Empty);

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

@@ -29 +29 @@
   public class HiveExperiment : NamedHiveItem {
     [DataMember]
-    public Guid UserId { get; set; }
+    public Guid OwnerUserId { get; set; }
     [DataMember]
     public Guid RootJobId { get; set; }
@@ -36 +36 @@
     [DataMember]
     public string ResourceNames { get; set; }
+    [DataMember]
+    public DateTime? LastAccessed { get; set; }
 
     public HiveExperiment() { }
     protected HiveExperiment(HiveExperiment original, Cloner cloner) : base(original, cloner) {
       this.RootJobId = original.RootJobId;
-      this.UserId = original.UserId;
+      this.OwnerUserId = original.OwnerUserId;
       this.DateCreated = original.DateCreated;
       this.ResourceNames = original.ResourceNames;
+      this.LastAccessed = original.LastAccessed;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
 using HeuristicLab.Common;
@@ -30 +29 @@
   [Serializable]
   public class Job : LightweightJob {
-    [DataMember]
-    public Guid UserId { get; set; }
     [DataMember]
     public int Priority { get; set; }
@@ -42 +39 @@
     [DataMember]
     public DateTime? LastHeartbeat { get; set; }
-
+    
     public Job() {
       this.PluginsNeededIds = new List<Guid>();
     }
     protected Job(Job original, Cloner cloner) : base(original, cloner) {
-      this.UserId = original.UserId;
       this.Priority = original.Priority;
       this.CoresNeeded = original.CoresNeeded;
@@ -59 +55 @@
 
     public override string ToString() {
-      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", JobState, SlaveId, DateCreated, DateCalculated, CoresNeeded, MemoryNeeded);
+      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", State, CurrentStateLog.SlaveId, DateCreated, CoresNeeded, MemoryNeeded);
     }
 

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

@@ -33 +33 @@
     Waiting,
 
-        /// <summary>
+    /// <summary>
+    /// The job is set to Finished when all child jobs are Finished.
+    /// </summary>
+    FinishOnChildJobsFinished,
+
+    /// <summary>
     /// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
     /// </summary>
-    WaitingForChildJobs,
+    ResumeOnChildJobsFinished,
+
+    /// <summary>
+    /// Job is beeing transferred
+    /// </summary>
+    Transferring,
 
     /// <summary>
@@ -72 +82 @@
     public static bool IsWaiting(this JobState jobState) {
       return jobState == JobState.Waiting ||
-        jobState == JobState.WaitingForChildJobs;
+        jobState == JobState.FinishOnChildJobsFinished;
     }
 

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.Serialization;
 using HeuristicLab.Common;
@@ -29 +31 @@
   public class LightweightJob : HiveItem {
     [DataMember]
-    public Guid? SlaveId { get; set; }
-    [DataMember]
-    public JobState JobState { get; set; }
-    [DataMember]
     public TimeSpan? ExecutionTime { get; set; }
     [DataMember]
-    public String Exception { get; set; }
+    public Guid? ParentJobId { get; set; }
     [DataMember]
-    public DateTime DateCreated { get; set; }
+    public List<StateLog> StateLog { get; set; }
     [DataMember]
-    public DateTime? DateCalculated { get; set; }
-    [DataMember]
-    public DateTime? DateFinished { get; set; }
-    [DataMember]
-    public Guid? ParentJobId { get; set; }
+    public JobState State { get; set; }
+
+    public StateLog CurrentStateLog { get { return StateLog.Last(); } }
+    public DateTime DateCreated { get { return StateLog.First().DateTime; } }
+    public DateTime? DateFinished { get { return CurrentStateLog.State == JobState.Finished ? new DateTime?(CurrentStateLog.DateTime) : null; } }
 
     public LightweightJob() {
-      JobState = DataTransfer.JobState.Offline;
+      StateLog = new List<DataTransfer.StateLog>();
     }
+
     public LightweightJob(Job job) {
-      this.SlaveId = job.SlaveId;
-      this.JobState = job.JobState;
       this.ExecutionTime = job.ExecutionTime;
-      this.Exception = job.Exception;
-      this.DateCreated = job.DateCreated;
-      this.DateCalculated = job.DateCalculated;
-      this.DateFinished = job.DateFinished;
       this.ParentJobId = job.ParentJobId;
+      this.StateLog = new List<StateLog>();
     }
-    protected LightweightJob(LightweightJob original, Cloner cloner) : base(original, cloner) {
-      this.SlaveId = original.SlaveId;
-      this.JobState = original.JobState;
+    protected LightweightJob(LightweightJob original, Cloner cloner)
+      : base(original, cloner) {
       this.ExecutionTime = original.ExecutionTime;
-      this.Exception = original.Exception;
-      this.DateCreated = original.DateCreated;
-      this.DateCalculated = original.DateCalculated;
-      this.DateFinished = original.DateFinished;
       this.ParentJobId = original.ParentJobId;
+      this.StateLog = new List<StateLog>(original.StateLog);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new LightweightJob(this, cloner);
     }
+
+    public void SetState(JobState state) {
+      this.State = state;
+      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now });
+    }
+
+    public void SetState(JobState state, Guid userId) {
+      this.State = state;
+      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, UserId = userId });
+    }
+
+    public void SetState(JobState state, Guid slaveId, string exception) {
+      this.State = state;
+      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, SlaveId = slaveId, Exception = exception });
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/HeuristicLab.Services.Hive.Common-3.4.csproj

@@ -97 +97 @@
     <None Include="HeuristicLabServicesHiveCommonPlugin.cs.frame" />
     <Compile Include="DataTransfer\Appointment.cs" />
+    <Compile Include="DataTransfer\HiveExperimentPermission.cs" />
+    <Compile Include="DataTransfer\StateLog.cs" />
     <Compile Include="DataTransfer\HeartBeat.cs" />
     <Compile Include="DataTransfer\HiveExperiment.cs" />
     <Compile Include="DataTransfer\HiveItem.cs" />
     <Compile Include="DataTransfer\HiveItemBase.cs" />
+    <Compile Include="DataTransfer\Permission.cs" />
     <Compile Include="DataTransfer\PluginData.cs" />
     <Compile Include="DataTransfer\Plugin.cs" />
@@ -106 +109 @@
     <Compile Include="DataTransfer\LightweightJob.cs" />
     <Compile Include="DataTransfer\JobState.cs" />
+    <Compile Include="Logger.cs" />
     <Compile Include="MessageContainer.cs" />
     <Compile Include="DataTransfer\NamedHiveItem.cs" />

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

@@ -12 +12 @@
     #region Job Methods
     [OperationContract]
-    Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> slaveGroupIds);
+    Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds);
 
     [OperationContract]
@@ -33 +33 @@
 
     [OperationContract]
-    void UpdateJob(Job jobDto, JobData jobDataDto);
+    void UpdateJob(Job jobDto);
+    
+    [OperationContract]
+    void UpdateJobData(Job jobDto, JobData jobDataDto);
 
     [OperationContract]

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

@@ -33 +33 @@
         Id = source.JobId,
         CoresNeeded = source.CoresNeeded,
-        DateCalculated = source.DateCalculated,
-        DateCreated = source.DateCreated,
-        DateFinished = source.DateFinished,
-        Exception = source.Exception,
-        ExecutionTime = source.ExecutionTime,
+        ExecutionTime = string.IsNullOrEmpty(source.ExecutionTime) ? TimeSpan.Zero : TimeSpan.Parse(source.ExecutionTime),
         MemoryNeeded = source.MemoryNeeded,
         ParentJobId = source.ParentJobId,
         Priority = source.Priority,
-        SlaveId = source.SlaveId,
-        JobState = source.JobState,
-        UserId = source.UserId,
         PluginsNeededIds = source.RequiredPlugins.Select(x => x.PluginId).ToList(),
-        LastHeartbeat = source.LastHeartbeat        
+        LastHeartbeat = source.LastHeartbeat,
+        State = source.State,
+        StateLog = source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList()
       };
     }
@@ -57 +52 @@
         target.JobId = source.Id;
         target.CoresNeeded = source.CoresNeeded;
-        target.DateCalculated = source.DateCalculated;
-        target.DateCreated = source.DateCreated;
-        target.DateFinished = source.DateFinished;
-        target.Exception = source.Exception;
-        target.ExecutionTime = source.ExecutionTime;
+        target.ExecutionTime = source.ExecutionTime.ToString();
         target.MemoryNeeded = source.MemoryNeeded;
         target.ParentJobId = source.ParentJobId;
         target.Priority = source.Priority;
-        target.SlaveId = source.SlaveId;
-        target.JobState = source.JobState;
-        target.UserId = source.UserId;
         target.LastHeartbeat = source.LastHeartbeat;
+        target.State = source.State;
+        if (target.StateLogs == null) target.StateLogs = new EntitySet<StateLog>();
+        target.StateLogs.AddRange(source.StateLog.Select(x => Convert.ToEntity(x)).OrderBy(x => x.DateTime));
         // RequiredPlugins are added by Dao
       }
@@ -91 +82 @@
     #endregion
 
+    #region StateLog
+    public static DT.StateLog ToDto(StateLog source) {
+      if (source == null) return null;
+      return new DT.StateLog { Id = source.StateLogId, DateTime = source.DateTime, Exception = source.Exception, JobId = source.JobId, SlaveId = source.SlaveId, State = source.State, UserId = source.UserId };
+    }
+    public static StateLog ToEntity(DT.StateLog source) {
+      if (source == null) return null;
+      var entity = new StateLog(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.StateLog source, StateLog target) {
+      if ((source != null) && (target != null)) {
+        target.StateLogId = source.Id; target.DateTime = source.DateTime; target.Exception = source.Exception; target.JobId = source.JobId; target.SlaveId = source.SlaveId; target.State = source.State; target.UserId = source.UserId;
+      }
+    }
+    #endregion
+
     #region HiveExperiment
     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, ResourceNames = source.ResourceIds };
+      return new DT.HiveExperiment { Id = source.HiveExperimentId, Description = source.Description, Name = source.Name, RootJobId = source.RootJobId, OwnerUserId = source.OwnerUserId, DateCreated = source.DateCreated, ResourceNames = source.ResourceIds, LastAccessed = source.LastAccessed };
     }
     public static HiveExperiment ToEntity(DT.HiveExperiment source) {
@@ -103 +111 @@
     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.ResourceIds = source.ResourceNames;
+        target.HiveExperimentId = source.Id; target.Description = source.Description; target.Name = source.Name; target.RootJobId = source.RootJobId; target.OwnerUserId = source.OwnerUserId; target.DateCreated = source.DateCreated; target.ResourceIds = source.ResourceNames; target.LastAccessed = source.LastAccessed;
+      }
+    }
+    #endregion
+
+    #region HiveExperimentPermission
+    public static DT.HiveExperimentPermission ToDto(HiveExperimentPermission source) {
+      if (source == null) return null;
+      return new DT.HiveExperimentPermission { HiveExperimentId = source.HiveExperimentId, GrantedUserId = source.GrantedUserId, GrantedByUserId = source.GrantedByUserId, Permission = source.Permission };
+    }
+    public static HiveExperimentPermission ToEntity(DT.HiveExperimentPermission source) {
+      if (source == null) return null;
+      var entity = new HiveExperimentPermission(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.HiveExperimentPermission source, HiveExperimentPermission target) {
+      if ((source != null) && (target != null)) {
+        target.HiveExperimentId = source.HiveExperimentId; target.GrantedUserId = source.GrantedUserId; target.GrantedByUserId = source.GrantedByUserId; target.Permission = source.Permission;
       }
     }
@@ -145 +170 @@
     public static DT.Slave ToDto(Slave source) {
       if (source == null) return null;
-      return new DT.Slave { 
-        Id = source.ResourceId, 
-        ParentResourceId = source.ParentResourceId, 
+      return new DT.Slave {
+        Id = source.ResourceId,
+        ParentResourceId = source.ParentResourceId,
         Cores = source.Cores,
-        CpuSpeed = source.CpuSpeed, 
-        FreeCores = source.FreeCores, 
-        FreeMemory = source.FreeMemory, 
-        IsAllowedToCalculate = source.IsAllowedToCalculate, 
-        Memory = source.Memory, 
-        Name = source.Name, 
-        SlaveState = source.SlaveState, 
-        CpuArchitecture = source.CpuArchitecture, 
+        CpuSpeed = source.CpuSpeed,
+        FreeCores = source.FreeCores,
+        FreeMemory = source.FreeMemory,
+        IsAllowedToCalculate = source.IsAllowedToCalculate,
+        Memory = source.Memory,
+        Name = source.Name,
+        SlaveState = source.SlaveState,
+        CpuArchitecture = source.CpuArchitecture,
         OperatingSystem = source.OperatingSystem,
         LastHeartbeat = source.LastHeartbeat
@@ -170 +195 @@
         target.ResourceId = source.Id;
         target.ParentResourceId = source.ParentResourceId;
-        target.Cores = source.Cores; 
+        target.Cores = source.Cores;
         target.CpuSpeed = source.CpuSpeed;
         target.FreeCores = source.FreeCores;
-        target.FreeMemory = source.FreeMemory; 
+        target.FreeMemory = source.FreeMemory;
         target.IsAllowedToCalculate = source.IsAllowedToCalculate;
         target.Memory = source.Memory;
-        target.Name = source.Name; 
-        target.SlaveState = source.SlaveState; 
-        target.CpuArchitecture = source.CpuArchitecture; 
+        target.Name = source.Name;
+        target.SlaveState = source.SlaveState;
+        target.CpuArchitecture = source.CpuArchitecture;
         target.OperatingSystem = source.OperatingSystem;
         target.LastHeartbeat = source.LastHeartbeat;

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

@@ -85 +85 @@
       using (var db = CreateContext()) {
         var query = from ar in db.AssignedResources
+                    join sl in db.StateLogs on ar.JobId equals sl.JobId
                     where resourceIds.Contains(ar.ResourceId)
-                       && ar.Job.JobState == JobState.WaitingForChildJobs
+                       && ar.Job.State == JobState.FinishOnChildJobsFinished
                        && (from child in db.Jobs
                            where child.ParentJobId == ar.Job.JobId
-                           select child.JobState == JobState.Finished).All(x => x)
+                           select child.State == JobState.Finished).All(x => x)
                        && (from child in db.Jobs // avoid returning WaitForChildJobs jobs where no child-jobs exist (yet)
                            where child.ParentJobId == ar.Job.JobId
@@ -107 +108 @@
         var query = from ar in db.AssignedResources
                     where resourceIds.Contains(ar.ResourceId)
-                       && ar.Job.JobState == JobState.Waiting
+                       && ar.Job.State == JobState.Waiting
                        && ar.Job.CoresNeeded <= slave.FreeCores
                        && ar.Job.MemoryNeeded <= slave.FreeMemory
@@ -197 +198 @@
       }
     }
+    #endregion
+
+    #region HiveExperimentPermission Methods
+
+    public DT.HiveExperimentPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId) {
+      using (var db = CreateContext()) {
+        return Convert.ToDto(db.HiveExperimentPermissions.SingleOrDefault(x => x.HiveExperimentId == hiveExperimentId && x.GrantedUserId == grantedUserId));
+      }
+    }
+
+    public IEnumerable<DT.HiveExperimentPermission> GetHiveExperimentPermissions(Expression<Func<HiveExperimentPermission, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.HiveExperimentPermissions.Where(predicate).Select(x => Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public void AddHiveExperimentPermission(DT.HiveExperimentPermission dto) {
+      using (var db = CreateContext()) {
+        var entity = Convert.ToEntity(dto);
+        db.HiveExperimentPermissions.InsertOnSubmit(entity);
+        db.SubmitChanges();
+      }
+    }
+
+    public void UpdateHiveExperimentPermission(DT.HiveExperimentPermission dto) {
+      using (var db = CreateContext()) {
+        var entity = db.HiveExperimentPermissions.FirstOrDefault(x => x.HiveExperimentId == dto.HiveExperimentId && x.GrantedUserId == dto.GrantedUserId);
+        if (entity == null) db.HiveExperimentPermissions.InsertOnSubmit(Convert.ToEntity(dto));
+        else Convert.ToEntity(dto, entity);
+        db.SubmitChanges();
+      }
+    }
+
+    public void DeleteHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId) {
+      using (var db = CreateContext()) {
+        var entity = db.HiveExperimentPermissions.FirstOrDefault(x => x.HiveExperimentId == hiveExperimentId && x.GrantedUserId == grantedUserId);
+        if (entity != null) db.HiveExperimentPermissions.DeleteOnSubmit(entity);
+        db.SubmitChanges();
+      }
+    }
+
     #endregion
 
@@ -440 +482 @@
 
     #region Authorization Methods
-    public bool IsUserAuthorizedForJobs(Guid userId, params Guid[] jobIds) {
-      using (var db = CreateContext()) {
-        var userIds = from job in db.Jobs // this needs to be fast!
-                      where jobIds.Contains(job.JobId)
-                      select job.UserId;
-        return userIds.All(x => x == userId);
-      }
-    }
+    public Permission GetPermissionForJob(Guid jobId, Guid userId) {
+      using (var db = CreateContext()) {
+        return GetPermissionForExperiment(GetExperimentForJob(jobId), userId);
+      }
+    }
+
+    public Permission GetPermissionForExperiment(Guid experimentId, Guid userId) {
+      using (var db = CreateContext()) {
+        HiveExperimentPermission permission = db.HiveExperimentPermissions.SingleOrDefault(p => p.HiveExperimentId == experimentId && p.GrantedUserId == userId);
+        return permission != null ? permission.Permission : Permission.NotAllowed;
+      }
+    }
+
+    public Guid GetExperimentForJob(Guid jobId) {
+      using (var db = CreateContext()) {
+        var job = db.Jobs.SingleOrDefault(j => j.JobId == jobId);
+        if (job.ParentJobId.HasValue) {
+          return GetExperimentForJob(job.ParentJobId.Value);
+        } else {
+          return db.HiveExperiments.SingleOrDefault(he => he.RootJobId == jobId).HiveExperimentId;
+        }
+      }
+    }
+
     #endregion
   }

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

@@ -39 +39 @@
       <Association Name="Resource_Resource" Member="ChildResources" ThisKey="ResourceId" OtherKey="ParentResourceId" Type="Resource" />
       <Association Name="Resource_UptimeCalendar" Member="UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeCalendar" />
+      <Association Name="Resource_StateLog" Member="StateLogs" ThisKey="ResourceId" OtherKey="SlaveId" Type="StateLog" />
       <Association Name="Resource_Resource" Member="ParentResource" ThisKey="ParentResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" />
       <Type Name="Slave" InheritanceCode="Slave" IsInheritanceDefault="true">
@@ -52 +53 @@
         <Column Name="OperatingSystem" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" UpdateCheck="Never" />
         <Column Name="LastHeartbeat" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
-        <Association Name="Slave_Job" Member="Jobs" ThisKey="ResourceId" OtherKey="SlaveId" Type="Job" />
       </Type>
       <Type Name="SlaveGroup" InheritanceCode="GROUP" />
@@ -61 +61 @@
       <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
       <Column Name="ParentJobId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="JobState" Type="global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState" DbType="VarChar(15)" CanBeNull="false" />
-      <Column Name="ResourceId" Member="SlaveId" Storage="_ResourceId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="ExecutionTime" Type="System.TimeSpan" DbType="Time" CanBeNull="true" />
-      <Column Name="Exception" Type="System.String" DbType="VarChar(MAX)" CanBeNull="true" />
-      <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime" CanBeNull="false" />
-      <Column Name="DateCalculated" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
-      <Column Name="DateFinished" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
+      <Column Name="ExecutionTime" Type="System.String" DbType="VarChar(30)" CanBeNull="true" />
       <Column Name="Priority" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
-      <Column Name="ProjectId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
       <Column Name="CoresNeeded" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
       <Column Name="MemoryNeeded" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
       <Column Name="LastHeartbeat" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
+      <Column Name="JobState" Member="State" Type="global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState" DbType="VarChar(30)" CanBeNull="false" />
       <Association Name="Job_AssignedResource" Member="AssignedResources" ThisKey="JobId" OtherKey="JobId" Type="AssignedResource" />
       <Association Name="Job_RequiredPlugin" Member="RequiredPlugins" ThisKey="JobId" OtherKey="JobId" Type="RequiredPlugin" />
       <Association Name="Job_Job" Member="ChildJobs" Storage="_Jobs" ThisKey="JobId" OtherKey="ParentJobId" Type="Job" />
       <Association Name="Job_JobData" Member="JobData" ThisKey="JobId" OtherKey="JobId" Type="JobData" Cardinality="One" />
+      <Association Name="Job_StateLog" Member="StateLogs" ThisKey="JobId" OtherKey="JobId" Type="StateLog" />
       <Association Name="Job_Job" Member="ParentJob" Storage="_Job1" ThisKey="ParentJobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
-      <Association Name="Slave_Job" Member="Slave" ThisKey="SlaveId" OtherKey="ResourceId" Type="Slave" IsForeignKey="true" DeleteRule="SET NULL" />
     </Type>
   </Table>
@@ -100 +93 @@
       <Column Name="Description" Type="System.String" DbType="VarChar(MAX)" CanBeNull="true" />
       <Column Name="ResourceIds" Type="System.String" DbType="VarChar(MAX)" CanBeNull="true" />
-      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
+      <Column Name="OwnerUserId" Storage="_UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
       <Column Name="RootJobId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
       <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime" CanBeNull="false" />
+      <Column Name="LastAccessed" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
+      <Column Name="IsHiveEngine" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
+      <Association Name="HiveExperiment_HiveExperimentPermission" Member="HiveExperimentPermissions" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="HiveExperimentPermission" />
       <Association Name="Job_HiveExperiment" Member="RootJob" Storage="_Job" ThisKey="RootJobId" OtherKey="JobId" Type="Job" IsForeignKey="true" DeleteRule="CASCADE" />
     </Type>
   </Table>
-  <Table Name="" Member="JobDatas">
+  <Table Name="dbo.JobData" Member="JobDatas">
     <Type Name="JobData">
       <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
@@ -114 +110 @@
     </Type>
   </Table>
-  <Table Name="" Member="PluginDatas">
+  <Table Name="dbo.PluginData" Member="PluginDatas">
     <Type Name="PluginData">
       <Column Name="PluginDataId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
@@ -123 +119 @@
     </Type>
   </Table>
+  <Table Name="dbo.StateLog" Member="StateLogs">
+    <Type Name="StateLog">
+      <Column Name="StateLogId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+      <Column Name="State" Type="global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState" DbType="VarChar(30) NOT NULL" CanBeNull="false" />
+      <Column Name="DateTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
+      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
+      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
+      <Column Name="SlaveId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
+      <Column Name="Exception" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
+      <Association Name="Job_StateLog" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
+      <Association Name="Resource_StateLog" Member="Resource" ThisKey="SlaveId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" />
+    </Type>
+  </Table>
+  <Table Name="dbo.HiveExperimentPermission" Member="HiveExperimentPermissions">
+    <Type Name="HiveExperimentPermission">
+      <Column Name="HiveExperimentId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
+      <Column Name="GrantedUserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
+      <Column Name="GrantedByUserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
+      <Column Name="Permission" Type="global::HeuristicLab.Services.Hive.Common.DataTransfer.Permission" DbType="VarChar(15) NOT NULL" CanBeNull="false" />
+      <Association Name="HiveExperiment_HiveExperimentPermission" Member="HiveExperiment" ThisKey="HiveExperimentId" OtherKey="HiveExperimentId" Type="HiveExperiment" IsForeignKey="true" />
+    </Type>
+  </Table>
 </Database>

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

@@ -3 +3 @@
   <DataContextMoniker Name="/HiveDataContext" />
   <nestedChildShapes>
-    <classShape Id="a929c9dc-69f4-4488-ba1c-a2342bf81d89" absoluteBounds="8.875, 3.75, 2, 1.3862939453124987">
+    <classShape Id="a929c9dc-69f4-4488-ba1c-a2342bf81d89" absoluteBounds="8.875, 3.875, 2, 1.3862939453124987">
       <DataClassMoniker Name="/HiveDataContext/AssignedResource" />
       <nestedChildShapes>
-        <elementListCompartment Id="8b005775-f0ee-41b0-ae10-6d1151003708" absoluteBounds="8.89, 4.2100000000000009, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="8b005775-f0ee-41b0-ae10-6d1151003708" absoluteBounds="8.89, 4.3350000000000009, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <classShape Id="7d998e56-4fba-41ca-a1a8-1dcdb9068edf" absoluteBounds="9, 5.5, 2, 1.9631982421874996">
+    <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="9.015, 5.9600000000000009, 1.9700000000000002, 1.4031982421875" 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>
@@ -27 +27 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 3.6939111328124996">
+    <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 2.3478011067708335">
       <DataClassMoniker Name="/HiveDataContext/Job" />
       <nestedChildShapes>
-        <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 3.1339111328125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -39 +39 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="e6f840cc-2968-4be1-b234-eef624ccacbb" absoluteBounds="4.125, 2.625, 2, 2.1554996744791666">
+    <classShape Id="e6f840cc-2968-4be1-b234-eef624ccacbb" absoluteBounds="4.125, 2.625, 2, 2.5401025390624996">
       <DataClassMoniker Name="/HiveDataContext/HiveExperiment" />
       <nestedChildShapes>
-        <elementListCompartment Id="0c65d4e1-256a-4a91-9a57-392f25e4de7f" absoluteBounds="4.1400000000000006, 3.0850000000000009, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="0c65d4e1-256a-4a91-9a57-392f25e4de7f" absoluteBounds="4.1400000000000006, 3.0850000000000009, 1.9700000000000002, 1.9801025390625" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -69 +69 @@
       </nodes>
     </inheritanceConnector>
-    <associationConnector edgePoints="[(11.9843735 : 2.57859537760417); (11.9843735 : 4.44314697265625); (10.875 : 4.44314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(11.9843735 : 2.57859537760417); (11.9843735 : 4.56814697265625); (10.875 : 4.56814697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_AssignedResource" />
       <nodes>
@@ -76 +76 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.5 : 4.22195556640625); (8.875 : 4.22195556640625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(8.5 : 3.34780110677083); (8.875 : 3.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
       <nodes>
@@ -83 +83 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(7.0898076923077 : 4.6939111328125); (7.0898076923077 : 5.5)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(7.4687475 : 3.34780110677083); (7.4687475 : 5.5)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
       <nodes>
@@ -97 +97 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.875 : 2.33735270182292); (8.5 : 2.33735270182292)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Slave/Slave_Job" />
-      <nodes>
-        <classShapeMoniker Id="26f4edfa-91dd-4941-a058-359f89e567a8" />
-        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
-      </nodes>
-    </associationConnector>
     <associationConnector edgePoints="[(12.781252 : 2.57859537760417); (12.781252 : 3.54212367513021); (13.5 : 3.54212367513021)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_UptimeCalendar" />
@@ -111 +104 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 3.65945556640625); (6.125 : 3.65945556640625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(6.5 : 2.98640055338542); (6.125 : 2.98640055338542)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_HiveExperiment" />
       <nodes>
@@ -124 +117 @@
       </nestedChildShapes>
     </classShape>
-    <classShape Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" absoluteBounds="11.625, 5.5, 2, 1.5785953776041666">
+    <classShape Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" absoluteBounds="11.25, 5.5, 2, 1.5785953776041666">
       <DataClassMoniker Name="/HiveDataContext/PluginData" />
       <nestedChildShapes>
-        <elementListCompartment Id="acddb513-7de6-4bb4-8335-d6982fb2ef35" absoluteBounds="11.64, 5.9600000000000009, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="acddb513-7de6-4bb4-8335-d6982fb2ef35" absoluteBounds="11.265, 5.9600000000000009, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(11 : 6.28929768880208); (11.625 : 6.28929768880208)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(10.875 : 6.28929768880208); (11.25 : 6.28929768880208)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_PluginData" />
       <nodes>
@@ -137 +130 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_JobData" />
       <nodes>
@@ -144 +137 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(9 : 6.19314697265625); (8.5 : 6.19314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(8.875 : 6.19314697265625); (8.5 : 6.19314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_RequiredPlugin" />
       <nodes>
@@ -158 +151 @@
       </nodes>
     </associationConnector>
+    <classShape Id="00352397-340e-449a-8e23-6ddd216e8617" absoluteBounds="1.75, 1, 2, 2.1554996744791666">
+      <DataClassMoniker Name="/HiveDataContext/StateLog" />
+      <nestedChildShapes>
+        <elementListCompartment Id="9a003897-deef-4bb5-b180-4c4bcdb7fadc" absoluteBounds="1.765, 1.46, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+      </nestedChildShapes>
+    </classShape>
+    <classShape Id="4d800dc9-1b18-469f-b02c-d4554757c5e1" absoluteBounds="1.75, 3.625, 2, 1.5785953776041666">
+      <DataClassMoniker Name="/HiveDataContext/HiveExperimentPermission" />
+      <nestedChildShapes>
+        <elementListCompartment Id="dedd97d3-a9a2-45a2-9b95-d7366fb65a7f" absoluteBounds="1.765, 4.085, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+      </nestedChildShapes>
+    </classShape>
+    <associationConnector edgePoints="[(6.5 : 2.50564697265625); (3.75 : 2.50564697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+      <AssociationMoniker Name="/HiveDataContext/Job/Job_StateLog" />
+      <nodes>
+        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
+        <classShapeMoniker Id="00352397-340e-449a-8e23-6ddd216e8617" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(11.25 : 1.78929768880208); (10.9375 : 1.78929768880208); (10.9375 : 0.6875); (2.75 : 0.6875); (2.75 : 1)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_StateLog" />
+      <nodes>
+        <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
+        <classShapeMoniker Id="00352397-340e-449a-8e23-6ddd216e8617" />
+      </nodes>
+    </associationConnector>
+    <associationConnector edgePoints="[(4.125 : 4.39505126953125); (3.75 : 4.39505126953125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+      <AssociationMoniker Name="/HiveDataContext/HiveExperiment/HiveExperiment_HiveExperimentPermission" />
+      <nodes>
+        <classShapeMoniker Id="e6f840cc-2968-4be1-b234-eef624ccacbb" />
+        <classShapeMoniker Id="4d800dc9-1b18-469f-b02c-d4554757c5e1" />
+      </nodes>
+    </associationConnector>
   </nestedChildShapes>
 </ordesignerObjectsDiagram>

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

@@ -58 +58 @@
     partial void UpdatePluginData(PluginData instance);
     partial void DeletePluginData(PluginData instance);
+    partial void InsertStateLog(StateLog instance);
+    partial void UpdateStateLog(StateLog instance);
+    partial void DeleteStateLog(StateLog instance);
+    partial void InsertHiveExperimentPermission(HiveExperimentPermission instance);
+    partial void UpdateHiveExperimentPermission(HiveExperimentPermission instance);
+    partial void DeleteHiveExperimentPermission(HiveExperimentPermission instance);
     #endregion
     
@@ -153 +159 @@
       {
         return this.GetTable<PluginData>();
+      }
+    }
+    
+    public System.Data.Linq.Table<StateLog> StateLogs
+    {
+      get
+      {
+        return this.GetTable<StateLog>();
+      }
+    }
+    
+    public System.Data.Linq.Table<HiveExperimentPermission> HiveExperimentPermissions
+    {
+      get
+      {
+        return this.GetTable<HiveExperimentPermission>();
       }
     }
@@ -788 +810 @@
     private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
     
-    protected System.Guid _ResourceId;
+    private System.Guid _ResourceId;
     
     private string _Name;
@@ -801 +823 @@
     
     private EntitySet<UptimeCalendar> _UptimeCalendars;
+    
+    private EntitySet<StateLog> _StateLogs;
     
     private EntityRef<Resource> _ParentResource;
@@ -823 +847 @@
       this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
       this._UptimeCalendars = new EntitySet<UptimeCalendar>(new Action<UptimeCalendar>(this.attach_UptimeCalendars), new Action<UptimeCalendar>(this.detach_UptimeCalendars));
+      this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
       this._ParentResource = default(EntityRef<Resource>);
       OnCreated();
@@ -950 +975 @@
     }
     
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_StateLog", Storage="_StateLogs", ThisKey="ResourceId", OtherKey="SlaveId")]
+    public EntitySet<StateLog> StateLogs
+    {
+      get
+      {
+        return this._StateLogs;
+      }
+      set
+      {
+        this._StateLogs.Assign(value);
+      }
+    }
+    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Resource", Storage="_ParentResource", ThisKey="ParentResourceId", OtherKey="ResourceId", IsForeignKey=true)]
     public Resource ParentResource
@@ -1035 +1073 @@
     
     private void detach_UptimeCalendars(UptimeCalendar entity)
+    {
+      this.SendPropertyChanging();
+      entity.Resource = null;
+    }
+    
+    private void attach_StateLogs(StateLog entity)
+    {
+      this.SendPropertyChanging();
+      entity.Resource = this;
+    }
+    
+    private void detach_StateLogs(StateLog entity)
     {
       this.SendPropertyChanging();
@@ -1065 +1115 @@
     
     private System.Nullable<System.DateTime> _LastHeartbeat;
-    
-    private EntitySet<Job> _Jobs;
     
     #region Extensibility Method Definitions
@@ -1098 +1146 @@
     public Slave()
     {
-      this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
       OnCreated();
     }
@@ -1320 +1367 @@
         }
       }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Slave_Job", Storage="_Jobs", ThisKey="ResourceId", OtherKey="SlaveId")]
-    public EntitySet<Job> Jobs
-    {
-      get
-      {
-        return this._Jobs;
-      }
-      set
-      {
-        this._Jobs.Assign(value);
-      }
-    }
-    
-    private void attach_Jobs(Job entity)
-    {
-      this.SendPropertyChanging();
-      entity.Slave = this;
-    }
-    
-    private void detach_Jobs(Job entity)
-    {
-      this.SendPropertyChanging();
-      entity.Slave = null;
     }
   }
@@ -1373 +1395 @@
     private System.Nullable<System.Guid> _ParentJobId;
     
-    private global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState _JobState;
-    
-    private System.Nullable<System.Guid> _ResourceId;
-    
-    private System.Nullable<System.TimeSpan> _ExecutionTime;
-    
-    private string _Exception;
-    
-    private System.DateTime _DateCreated;
-    
-    private System.Nullable<System.DateTime> _DateCalculated;
-    
-    private System.Nullable<System.DateTime> _DateFinished;
+    private string _ExecutionTime;
     
     private int _Priority;
     
-    private System.Nullable<System.Guid> _ProjectId;
-    
-    private System.Guid _UserId;
-    
     private int _CoresNeeded;
     
@@ -1399 +1405 @@
     private System.Nullable<System.DateTime> _LastHeartbeat;
     
+    private global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState _State;
+    
     private EntitySet<AssignedResource> _AssignedResources;
     
@@ -1407 +1415 @@
     private EntityRef<JobData> _JobData;
     
+    private EntitySet<StateLog> _StateLogs;
+    
     private EntityRef<Job> _Job1;
-    
-    private EntityRef<Slave> _Slave;
     
     #region Extensibility Method Definitions
@@ -1419 +1427 @@
     partial void OnParentJobIdChanging(System.Nullable<System.Guid> value);
     partial void OnParentJobIdChanged();
-    partial void OnJobStateChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState value);
-    partial void OnJobStateChanged();
-    partial void OnSlaveIdChanging(System.Nullable<System.Guid> value);
-    partial void OnSlaveIdChanged();
-    partial void OnExecutionTimeChanging(System.Nullable<System.TimeSpan> value);
+    partial void OnExecutionTimeChanging(string value);
     partial void OnExecutionTimeChanged();
-    partial void OnExceptionChanging(string value);
-    partial void OnExceptionChanged();
-    partial void OnDateCreatedChanging(System.DateTime value);
-    partial void OnDateCreatedChanged();
-    partial void OnDateCalculatedChanging(System.Nullable<System.DateTime> value);
-    partial void OnDateCalculatedChanged();
-    partial void OnDateFinishedChanging(System.Nullable<System.DateTime> value);
-    partial void OnDateFinishedChanged();
     partial void OnPriorityChanging(int value);
     partial void OnPriorityChanged();
-    partial void OnProjectIdChanging(System.Nullable<System.Guid> value);
-    partial void OnProjectIdChanged();
-    partial void OnUserIdChanging(System.Guid value);
-    partial void OnUserIdChanged();
     partial void OnCoresNeededChanging(int value);
     partial void OnCoresNeededChanged();
@@ -1445 +1437 @@
     partial void OnLastHeartbeatChanging(System.Nullable<System.DateTime> value);
     partial void OnLastHeartbeatChanged();
+    partial void OnStateChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState value);
+    partial void OnStateChanged();
     #endregion
     
@@ -1453 +1447 @@
       this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
       this._JobData = default(EntityRef<JobData>);
+      this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
       this._Job1 = default(EntityRef<Job>);
-      this._Slave = default(EntityRef<Slave>);
       OnCreated();
     }
@@ -1502 +1496 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobState", DbType="VarChar(15)", CanBeNull=false)]
-    public global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState JobState
-    {
-      get
-      {
-        return this._JobState;
-      }
-      set
-      {
-        if ((this._JobState != value))
-        {
-          this.OnJobStateChanging(value);
-          this.SendPropertyChanging();
-          this._JobState = value;
-          this.SendPropertyChanged("JobState");
-          this.OnJobStateChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceId", Storage="_ResourceId", DbType="UniqueIdentifier")]
-    public System.Nullable<System.Guid> SlaveId
-    {
-      get
-      {
-        return this._ResourceId;
-      }
-      set
-      {
-        if ((this._ResourceId != value))
-        {
-          this.OnSlaveIdChanging(value);
-          this.SendPropertyChanging();
-          this._ResourceId = value;
-          this.SendPropertyChanged("SlaveId");
-          this.OnSlaveIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExecutionTime", DbType="Time")]
-    public System.Nullable<System.TimeSpan> ExecutionTime
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExecutionTime", DbType="VarChar(30)")]
+    public string ExecutionTime
     {
       get
@@ -1562 +1516 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Exception", DbType="VarChar(MAX)")]
-    public string Exception
-    {
-      get
-      {
-        return this._Exception;
-      }
-      set
-      {
-        if ((this._Exception != value))
-        {
-          this.OnExceptionChanging(value);
-          this.SendPropertyChanging();
-          this._Exception = value;
-          this.SendPropertyChanged("Exception");
-          this.OnExceptionChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated", DbType="DateTime")]
-    public System.DateTime DateCreated
-    {
-      get
-      {
-        return this._DateCreated;
-      }
-      set
-      {
-        if ((this._DateCreated != value))
-        {
-          this.OnDateCreatedChanging(value);
-          this.SendPropertyChanging();
-          this._DateCreated = value;
-          this.SendPropertyChanged("DateCreated");
-          this.OnDateCreatedChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCalculated", DbType="DateTime")]
-    public System.Nullable<System.DateTime> DateCalculated
-    {
-      get
-      {
-        return this._DateCalculated;
-      }
-      set
-      {
-        if ((this._DateCalculated != value))
-        {
-          this.OnDateCalculatedChanging(value);
-          this.SendPropertyChanging();
-          this._DateCalculated = value;
-          this.SendPropertyChanged("DateCalculated");
-          this.OnDateCalculatedChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateFinished", DbType="DateTime")]
-    public System.Nullable<System.DateTime> DateFinished
-    {
-      get
-      {
-        return this._DateFinished;
-      }
-      set
-      {
-        if ((this._DateFinished != value))
-        {
-          this.OnDateFinishedChanging(value);
-          this.SendPropertyChanging();
-          this._DateFinished = value;
-          this.SendPropertyChanged("DateFinished");
-          this.OnDateFinishedChanged();
-        }
-      }
-    }
-    
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Priority", DbType="Int NOT NULL")]
     public int Priority
@@ -1662 +1536 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="UniqueIdentifier")]
-    public System.Nullable<System.Guid> ProjectId
-    {
-      get
-      {
-        return this._ProjectId;
-      }
-      set
-      {
-        if ((this._ProjectId != value))
-        {
-          this.OnProjectIdChanging(value);
-          this.SendPropertyChanging();
-          this._ProjectId = value;
-          this.SendPropertyChanged("ProjectId");
-          this.OnProjectIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier")]
-    public System.Guid UserId
-    {
-      get
-      {
-        return this._UserId;
-      }
-      set
-      {
-        if ((this._UserId != value))
-        {
-          this.OnUserIdChanging(value);
-          this.SendPropertyChanging();
-          this._UserId = value;
-          this.SendPropertyChanged("UserId");
-          this.OnUserIdChanged();
-        }
-      }
-    }
-    
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoresNeeded", DbType="Int NOT NULL")]
     public int CoresNeeded
@@ -1762 +1596 @@
     }
     
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="JobState", Storage="_State", DbType="VarChar(30)", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState State
+    {
+      get
+      {
+        return this._State;
+      }
+      set
+      {
+        if ((this._State != value))
+        {
+          this.OnStateChanging(value);
+          this.SendPropertyChanging();
+          this._State = value;
+          this.SendPropertyChanged("State");
+          this.OnStateChanged();
+        }
+      }
+    }
+    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_AssignedResource", Storage="_AssignedResources", ThisKey="JobId", OtherKey="JobId")]
     public EntitySet<AssignedResource> AssignedResources
@@ -1830 +1684 @@
     }
     
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_StateLog", Storage="_StateLogs", ThisKey="JobId", OtherKey="JobId")]
+    public EntitySet<StateLog> StateLogs
+    {
+      get
+      {
+        return this._StateLogs;
+      }
+      set
+      {
+        this._StateLogs.Assign(value);
+      }
+    }
+    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_Job", Storage="_Job1", ThisKey="ParentJobId", OtherKey="JobId", IsForeignKey=true)]
     public Job ParentJob
@@ -1864 +1731 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Slave_Job", Storage="_Slave", ThisKey="SlaveId", OtherKey="ResourceId", IsForeignKey=true, DeleteRule="SET NULL")]
-    public Slave Slave
-    {
-      get
-      {
-        return this._Slave.Entity;
-      }
-      set
-      {
-        Slave previousValue = this._Slave.Entity;
-        if (((previousValue != value) 
-              || (this._Slave.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._Slave.Entity = null;
-            previousValue.Jobs.Remove(this);
-          }
-          this._Slave.Entity = value;
-          if ((value != null))
-          {
-            value.Jobs.Add(this);
-            this._ResourceId = value.ResourceId;
-          }
-          else
-          {
-            this._ResourceId = default(Nullable<System.Guid>);
-          }
-          this.SendPropertyChanged("Slave");
-        }
-      }
-    }
-    
     public event PropertyChangingEventHandler PropertyChanging;
     
@@ -1952 +1785 @@
       this.SendPropertyChanging();
       entity.ParentJob = null;
+    }
+    
+    private void attach_StateLogs(StateLog entity)
+    {
+      this.SendPropertyChanging();
+      entity.Job = this;
+    }
+    
+    private void detach_StateLogs(StateLog entity)
+    {
+      this.SendPropertyChanging();
+      entity.Job = null;
     }
   }
@@ -2222 +2067 @@
     private System.DateTime _DateCreated;
     
+    private System.Nullable<System.DateTime> _LastAccessed;
+    
+    private bool _IsHiveEngine;
+    
+    private EntitySet<HiveExperimentPermission> _HiveExperimentPermissions;
+    
     private EntityRef<Job> _Job;
     
@@ -2236 +2087 @@
     partial void OnResourceIdsChanging(string value);
     partial void OnResourceIdsChanged();
-    partial void OnUserIdChanging(System.Guid value);
-    partial void OnUserIdChanged();
+    partial void OnOwnerUserIdChanging(System.Guid value);
+    partial void OnOwnerUserIdChanged();
     partial void OnRootJobIdChanging(System.Guid value);
     partial void OnRootJobIdChanged();
     partial void OnDateCreatedChanging(System.DateTime value);
     partial void OnDateCreatedChanged();
+    partial void OnLastAccessedChanging(System.Nullable<System.DateTime> value);
+    partial void OnLastAccessedChanged();
+    partial void OnIsHiveEngineChanging(bool value);
+    partial void OnIsHiveEngineChanged();
     #endregion
     
     public HiveExperiment()
     {
+      this._HiveExperimentPermissions = new EntitySet<HiveExperimentPermission>(new Action<HiveExperimentPermission>(this.attach_HiveExperimentPermissions), new Action<HiveExperimentPermission>(this.detach_HiveExperimentPermissions));
       this._Job = default(EntityRef<Job>);
       OnCreated();
@@ -2331 +2187 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier")]
-    public System.Guid UserId
+    public System.Guid OwnerUserId
     {
       get
@@ -2341 +2197 @@
         if ((this._UserId != value))
         {
-          this.OnUserIdChanging(value);
+          this.OnOwnerUserIdChanging(value);
           this.SendPropertyChanging();
           this._UserId = value;
-          this.SendPropertyChanged("UserId");
-          this.OnUserIdChanged();
+          this.SendPropertyChanged("OwnerUserId");
+          this.OnOwnerUserIdChanged();
         }
       }
@@ -2394 +2250 @@
     }
     
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastAccessed", DbType="DateTime")]
+    public System.Nullable<System.DateTime> LastAccessed
+    {
+      get
+      {
+        return this._LastAccessed;
+      }
+      set
+      {
+        if ((this._LastAccessed != value))
+        {
+          this.OnLastAccessedChanging(value);
+          this.SendPropertyChanging();
+          this._LastAccessed = value;
+          this.SendPropertyChanged("LastAccessed");
+          this.OnLastAccessedChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsHiveEngine", DbType="Bit")]
+    public bool IsHiveEngine
+    {
+      get
+      {
+        return this._IsHiveEngine;
+      }
+      set
+      {
+        if ((this._IsHiveEngine != value))
+        {
+          this.OnIsHiveEngineChanging(value);
+          this.SendPropertyChanging();
+          this._IsHiveEngine = value;
+          this.SendPropertyChanged("IsHiveEngine");
+          this.OnIsHiveEngineChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_HiveExperimentPermission", Storage="_HiveExperimentPermissions", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId")]
+    public EntitySet<HiveExperimentPermission> HiveExperimentPermissions
+    {
+      get
+      {
+        return this._HiveExperimentPermissions;
+      }
+      set
+      {
+        this._HiveExperimentPermissions.Assign(value);
+      }
+    }
+    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_HiveExperiment", Storage="_Job", ThisKey="RootJobId", OtherKey="JobId", IsForeignKey=true, DeleteRule="CASCADE")]
     public Job RootJob
@@ -2431 +2340 @@
       }
     }
+    
+    private void attach_HiveExperimentPermissions(HiveExperimentPermission entity)
+    {
+      this.SendPropertyChanging();
+      entity.HiveExperiment = this;
+    }
+    
+    private void detach_HiveExperimentPermissions(HiveExperimentPermission entity)
+    {
+      this.SendPropertyChanging();
+      entity.HiveExperiment = null;
+    }
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JobData")]
   public partial class JobData : INotifyPropertyChanging, INotifyPropertyChanged
   {
@@ -2584 +2505 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PluginData")]
   public partial class PluginData : INotifyPropertyChanging, INotifyPropertyChanged
   {
@@ -2758 +2679 @@
     }
   }
+  
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.StateLog")]
+  public partial class StateLog : INotifyPropertyChanging, INotifyPropertyChanged
+  {
+    
+    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+    
+    private System.Guid _StateLogId;
+    
+    private global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState _State;
+    
+    private System.DateTime _DateTime;
+    
+    private System.Guid _JobId;
+    
+    private System.Nullable<System.Guid> _UserId;
+    
+    private System.Nullable<System.Guid> _SlaveId;
+    
+    private string _Exception;
+    
+    private EntityRef<Job> _Job;
+    
+    private EntityRef<Resource> _Resource;
+    
+    #region Extensibility Method Definitions
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnStateLogIdChanging(System.Guid value);
+    partial void OnStateLogIdChanged();
+    partial void OnStateChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState value);
+    partial void OnStateChanged();
+    partial void OnDateTimeChanging(System.DateTime value);
+    partial void OnDateTimeChanged();
+    partial void OnJobIdChanging(System.Guid value);
+    partial void OnJobIdChanged();
+    partial void OnUserIdChanging(System.Nullable<System.Guid> value);
+    partial void OnUserIdChanged();
+    partial void OnSlaveIdChanging(System.Nullable<System.Guid> value);
+    partial void OnSlaveIdChanged();
+    partial void OnExceptionChanging(string value);
+    partial void OnExceptionChanged();
+    #endregion
+    
+    public StateLog()
+    {
+      this._Job = default(EntityRef<Job>);
+      this._Resource = default(EntityRef<Resource>);
+      OnCreated();
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StateLogId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
+    public System.Guid StateLogId
+    {
+      get
+      {
+        return this._StateLogId;
+      }
+      set
+      {
+        if ((this._StateLogId != value))
+        {
+          this.OnStateLogIdChanging(value);
+          this.SendPropertyChanging();
+          this._StateLogId = value;
+          this.SendPropertyChanged("StateLogId");
+          this.OnStateLogIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="VarChar(30) NOT NULL", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState State
+    {
+      get
+      {
+        return this._State;
+      }
+      set
+      {
+        if ((this._State != value))
+        {
+          this.OnStateChanging(value);
+          this.SendPropertyChanging();
+          this._State = value;
+          this.SendPropertyChanged("State");
+          this.OnStateChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateTime", DbType="DateTime NOT NULL")]
+    public System.DateTime DateTime
+    {
+      get
+      {
+        return this._DateTime;
+      }
+      set
+      {
+        if ((this._DateTime != value))
+        {
+          this.OnDateTimeChanging(value);
+          this.SendPropertyChanging();
+          this._DateTime = value;
+          this.SendPropertyChanged("DateTime");
+          this.OnDateTimeChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL")]
+    public System.Guid JobId
+    {
+      get
+      {
+        return this._JobId;
+      }
+      set
+      {
+        if ((this._JobId != value))
+        {
+          if (this._Job.HasLoadedOrAssignedValue)
+          {
+            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+          }
+          this.OnJobIdChanging(value);
+          this.SendPropertyChanging();
+          this._JobId = value;
+          this.SendPropertyChanged("JobId");
+          this.OnJobIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier")]
+    public System.Nullable<System.Guid> UserId
+    {
+      get
+      {
+        return this._UserId;
+      }
+      set
+      {
+        if ((this._UserId != value))
+        {
+          this.OnUserIdChanging(value);
+          this.SendPropertyChanging();
+          this._UserId = value;
+          this.SendPropertyChanged("UserId");
+          this.OnUserIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SlaveId", DbType="UniqueIdentifier")]
+    public System.Nullable<System.Guid> SlaveId
+    {
+      get
+      {
+        return this._SlaveId;
+      }
+      set
+      {
+        if ((this._SlaveId != value))
+        {
+          if (this._Resource.HasLoadedOrAssignedValue)
+          {
+            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+          }
+          this.OnSlaveIdChanging(value);
+          this.SendPropertyChanging();
+          this._SlaveId = value;
+          this.SendPropertyChanged("SlaveId");
+          this.OnSlaveIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Exception", DbType="VarChar(MAX)", CanBeNull=false)]
+    public string Exception
+    {
+      get
+      {
+        return this._Exception;
+      }
+      set
+      {
+        if ((this._Exception != value))
+        {
+          this.OnExceptionChanging(value);
+          this.SendPropertyChanging();
+          this._Exception = value;
+          this.SendPropertyChanged("Exception");
+          this.OnExceptionChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Job_StateLog", Storage="_Job", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true)]
+    public Job Job
+    {
+      get
+      {
+        return this._Job.Entity;
+      }
+      set
+      {
+        Job previousValue = this._Job.Entity;
+        if (((previousValue != value) 
+              || (this._Job.HasLoadedOrAssignedValue == false)))
+        {
+          this.SendPropertyChanging();
+          if ((previousValue != null))
+          {
+            this._Job.Entity = null;
+            previousValue.StateLogs.Remove(this);
+          }
+          this._Job.Entity = value;
+          if ((value != null))
+          {
+            value.StateLogs.Add(this);
+            this._JobId = value.JobId;
+          }
+          else
+          {
+            this._JobId = default(System.Guid);
+          }
+          this.SendPropertyChanged("Job");
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_StateLog", Storage="_Resource", ThisKey="SlaveId", OtherKey="ResourceId", IsForeignKey=true)]
+    public Resource Resource
+    {
+      get
+      {
+        return this._Resource.Entity;
+      }
+      set
+      {
+        Resource previousValue = this._Resource.Entity;
+        if (((previousValue != value) 
+              || (this._Resource.HasLoadedOrAssignedValue == false)))
+        {
+          this.SendPropertyChanging();
+          if ((previousValue != null))
+          {
+            this._Resource.Entity = null;
+            previousValue.StateLogs.Remove(this);
+          }
+          this._Resource.Entity = value;
+          if ((value != null))
+          {
+            value.StateLogs.Add(this);
+            this._SlaveId = value.ResourceId;
+          }
+          else
+          {
+            this._SlaveId = default(Nullable<System.Guid>);
+          }
+          this.SendPropertyChanged("Resource");
+        }
+      }
+    }
+    
+    public event PropertyChangingEventHandler PropertyChanging;
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    
+    protected virtual void SendPropertyChanging()
+    {
+      if ((this.PropertyChanging != null))
+      {
+        this.PropertyChanging(this, emptyChangingEventArgs);
+      }
+    }
+    
+    protected virtual void SendPropertyChanged(String propertyName)
+    {
+      if ((this.PropertyChanged != null))
+      {
+        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+      }
+    }
+  }
+  
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HiveExperimentPermission")]
+  public partial class HiveExperimentPermission : INotifyPropertyChanging, INotifyPropertyChanged
+  {
+    
+    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+    
+    private System.Guid _HiveExperimentId;
+    
+    private System.Guid _GrantedUserId;
+    
+    private System.Guid _GrantedByUserId;
+    
+    private global::HeuristicLab.Services.Hive.Common.DataTransfer.Permission _Permission;
+    
+    private EntityRef<HiveExperiment> _HiveExperiment;
+    
+    #region Extensibility Method Definitions
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnHiveExperimentIdChanging(System.Guid value);
+    partial void OnHiveExperimentIdChanged();
+    partial void OnGrantedUserIdChanging(System.Guid value);
+    partial void OnGrantedUserIdChanged();
+    partial void OnGrantedByUserIdChanging(System.Guid value);
+    partial void OnGrantedByUserIdChanged();
+    partial void OnPermissionChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.Permission value);
+    partial void OnPermissionChanged();
+    #endregion
+    
+    public HiveExperimentPermission()
+    {
+      this._HiveExperiment = default(EntityRef<HiveExperiment>);
+      OnCreated();
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiveExperimentId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
+    public System.Guid HiveExperimentId
+    {
+      get
+      {
+        return this._HiveExperimentId;
+      }
+      set
+      {
+        if ((this._HiveExperimentId != value))
+        {
+          if (this._HiveExperiment.HasLoadedOrAssignedValue)
+          {
+            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+          }
+          this.OnHiveExperimentIdChanging(value);
+          this.SendPropertyChanging();
+          this._HiveExperimentId = value;
+          this.SendPropertyChanged("HiveExperimentId");
+          this.OnHiveExperimentIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrantedUserId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
+    public System.Guid GrantedUserId
+    {
+      get
+      {
+        return this._GrantedUserId;
+      }
+      set
+      {
+        if ((this._GrantedUserId != value))
+        {
+          this.OnGrantedUserIdChanging(value);
+          this.SendPropertyChanging();
+          this._GrantedUserId = value;
+          this.SendPropertyChanged("GrantedUserId");
+          this.OnGrantedUserIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrantedByUserId", DbType="UniqueIdentifier NOT NULL")]
+    public System.Guid GrantedByUserId
+    {
+      get
+      {
+        return this._GrantedByUserId;
+      }
+      set
+      {
+        if ((this._GrantedByUserId != value))
+        {
+          this.OnGrantedByUserIdChanging(value);
+          this.SendPropertyChanging();
+          this._GrantedByUserId = value;
+          this.SendPropertyChanged("GrantedByUserId");
+          this.OnGrantedByUserIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Permission", DbType="VarChar(15) NOT NULL", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.Common.DataTransfer.Permission Permission
+    {
+      get
+      {
+        return this._Permission;
+      }
+      set
+      {
+        if ((this._Permission != value))
+        {
+          this.OnPermissionChanging(value);
+          this.SendPropertyChanging();
+          this._Permission = value;
+          this.SendPropertyChanged("Permission");
+          this.OnPermissionChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_HiveExperimentPermission", Storage="_HiveExperiment", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId", IsForeignKey=true)]
+    public HiveExperiment HiveExperiment
+    {
+      get
+      {
+        return this._HiveExperiment.Entity;
+      }
+      set
+      {
+        HiveExperiment previousValue = this._HiveExperiment.Entity;
+        if (((previousValue != value) 
+              || (this._HiveExperiment.HasLoadedOrAssignedValue == false)))
+        {
+          this.SendPropertyChanging();
+          if ((previousValue != null))
+          {
+            this._HiveExperiment.Entity = null;
+            previousValue.HiveExperimentPermissions.Remove(this);
+          }
+          this._HiveExperiment.Entity = value;
+          if ((value != null))
+          {
+            value.HiveExperimentPermissions.Add(this);
+            this._HiveExperimentId = value.HiveExperimentId;
+          }
+          else
+          {
+            this._HiveExperimentId = default(System.Guid);
+          }
+          this.SendPropertyChanged("HiveExperiment");
+        }
+      }
+    }
+    
+    public event PropertyChangingEventHandler PropertyChanging;
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    
+    protected virtual void SendPropertyChanging()
+    {
+      if ((this.PropertyChanging != null))
+      {
+        this.PropertyChanging(this, emptyChangingEventArgs);
+      }
+    }
+    
+    protected virtual void SendPropertyChanged(String propertyName)
+    {
+      if ((this.PropertyChanged != null))
+      {
+        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+      }
+    }
+  }
 }
 #pragma warning restore 1591

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Interfaces/IHiveDao.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 
 namespace HeuristicLab.Services.Hive.DataAccess {
+  using HeuristicLab.Services.Hive.Common.DataTransfer;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
@@ -32 +31 @@
     void UpdateHiveExperiment(DT.HiveExperiment dto);
     void DeleteHiveExperiment(Guid id);
+    #endregion
+
+    #region HiveExperimentPermission Methods
+    DT.HiveExperimentPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId);
+    IEnumerable<DT.HiveExperimentPermission> GetHiveExperimentPermissions(Expression<Func<HiveExperimentPermission, bool>> predicate);
+    void AddHiveExperimentPermission(DT.HiveExperimentPermission dto);
+    void UpdateHiveExperimentPermission(DT.HiveExperimentPermission dto);
+    void DeleteHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId);
     #endregion
 
@@ -80 +87 @@
 
     #region Authorization Methods
-    bool IsUserAuthorizedForJobs(Guid userId, params Guid[] jobIds);
+    Permission GetPermissionForJob(Guid jobId, Guid userId);
+    Permission GetPermissionForExperiment(Guid experimentId, Guid userId);
+    Guid GetExperimentForJob(Guid jobId);
     #endregion
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Tools/CreateHiveDatabaseApplication.cs

@@ -28 +28 @@
   class CreateHiveDatabaseApplication : ApplicationBase {
 
-    public override void Run() {
+    public override void Run() { 
       using (var db = HiveDao.CreateContext()) {
         if (db.DatabaseExists())

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Tools/prepareHiveDatabase.sql

@@ -40 +40 @@
 ALTER TABLE dbo.Job ALTER COLUMN JobId ADD ROWGUIDCOL;
 ALTER TABLE dbo.Job WITH NOCHECK ADD CONSTRAINT [DF_Job_JobId] DEFAULT (newid()) FOR JobId;
+GO
 
---ALTER TABLE [dbo].[Job]  DROP  CONSTRAINT [Slave_Job]
---ALTER TABLE [dbo].[Job]  WITH CHECK ADD  CONSTRAINT [Slave_Job] FOREIGN KEY([ResourceId])
---REFERENCES [dbo].[Resource] ([ResourceId])
---ON UPDATE CASCADE
---ON DELETE SET NULL
---GO
+ALTER TABLE [dbo].[StateLog]  DROP  CONSTRAINT [Job_StateLog]
+ALTER TABLE [dbo].[StateLog]  WITH CHECK ADD CONSTRAINT [Job_StateLog] FOREIGN KEY([JobId])
+REFERENCES [dbo].[Job] ([JobId])
+ON UPDATE CASCADE
+ON DELETE CASCADE
+GO
 
 ALTER TABLE dbo.Plugin ALTER COLUMN PluginId ADD ROWGUIDCOL;
@@ -79 +80 @@
 ALTER TABLE dbo.HiveExperiment ALTER COLUMN HiveExperimentId ADD ROWGUIDCOL;
 ALTER TABLE dbo.HiveExperiment WITH NOCHECK ADD CONSTRAINT [DF_HiveExperiment_HiveExperimentId] DEFAULT (newid()) FOR HiveExperimentId;
+
+ALTER TABLE dbo.StateLog ALTER COLUMN StateLogId ADD ROWGUIDCOL;
+ALTER TABLE dbo.StateLog WITH NOCHECK ADD CONSTRAINT [DF_StateLog_StateLogId] DEFAULT (newid()) FOR StateLogId;
+
+ALTER TABLE [dbo].[HiveExperimentPermission]  DROP  CONSTRAINT [HiveExperiment_HiveExperimentPermission]
+ALTER TABLE [dbo].[HiveExperimentPermission]  WITH CHECK ADD CONSTRAINT [HiveExperiment_HiveExperimentPermission] FOREIGN KEY([HiveExperimentId])
+REFERENCES [dbo].[HiveExperiment] ([HiveExperimentId])
+ON UPDATE CASCADE
+ON DELETE CASCADE
+GO
 
 /* create indices */

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/DaoTests.cs

@@ -1 +1 @@
 using System;
-using System.Text;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Clients.Hive.Slave.Tests;
-using HeuristicLab.Clients.Hive;
 using HeuristicLab.Services.Hive.DataAccess;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace HeuristicLab.Services.Hive.Tests {
-  using DA = HeuristicLab.Services.Hive.DataAccess;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
@@ -32 +27 @@
       
       DT.Job job1 = new DT.Job();
-      job1.DateCreated = DateTime.Now;
+      job1.SetState(JobState.Offline, Guid.NewGuid());
 
       DT.Plugin plugin1 = new DT.Plugin();
@@ -57 +52 @@
       Assert.AreEqual(job1.Id, job1loaded.Id);
       Assert.AreEqual(job1.CoresNeeded, job1loaded.CoresNeeded);
-      Assert.AreEqual(null, job1loaded.DateCalculated);
       Assert.AreEqual(job1.DateCreated.ToString(), job1loaded.DateCreated.ToString());
       Assert.AreEqual(null, job1loaded.DateFinished);
       Assert.IsTrue(job1.PluginsNeededIds.SequenceEqual(job1loaded.PluginsNeededIds));
-      
+      Assert.AreEqual(job1.StateLog.Count, job1loaded.StateLog.Count);
+      for (int i = 0; i < job1.StateLog.Count; i++) {
+        Assert.AreEqual(job1.Id, job1loaded.StateLog[i].JobId);
+        Assert.AreEqual(job1.StateLog[i].State, job1loaded.StateLog[i].State);
+        Assert.AreEqual(job1.StateLog[i].SlaveId, job1loaded.StateLog[i].SlaveId);
+        Assert.AreEqual(job1.StateLog[i].UserId, job1loaded.StateLog[i].UserId);
+        Assert.AreEqual(job1.StateLog[i].Exception, job1loaded.StateLog[i].Exception);
+        Assert.IsTrue(Math.Abs((job1.StateLog[i].DateTime - job1loaded.StateLog[i].DateTime).TotalSeconds) < 1);
+      }
+
       dao.DeleteJob(job1.Id);
 
@@ -96 +99 @@
       dao.DeleteSlave(slave.Id);
       dao.DeleteSlaveGroup(slaveGroup.Id);
-    }
-
-    [TestMethod]
-    public void TestJobDaoWaiting() {
-      IHiveDao dao = ServiceLocator.Instance.HiveDao;
-
-      DT.Job job = new DT.Job();
-      job.DateCreated = DateTime.Now;
-      job.JobState = JobState.Waiting;
-      job.Id = dao.AddJob(job);
-
-      // todo
     }
 
@@ -152 +143 @@
     }
 
+    [TestMethod]
+    public void TestHiveExperimentDao() {
+      IHiveDao dao = ServiceLocator.Instance.HiveDao;
+
+      DT.HiveExperiment he = new DT.HiveExperiment();
+
+      DT.Job job = new DT.Job();
+      job.SetState(JobState.Offline, Guid.NewGuid());
+      job.Id = dao.AddJob(job);
+
+      he.RootJobId = job.Id;
+      he.DateCreated = DateTime.Now;
+      he.Name = "TestExperiment";
+      he.OwnerUserId = Guid.NewGuid();
+      he.ResourceNames = "HEAL";
+
+      he.Id = dao.AddHiveExperiment(he);
+
+      DT.HiveExperimentPermission perm = new DT.HiveExperimentPermission();
+      perm.HiveExperimentId = he.Id;
+      perm.GrantedByUserId = he.OwnerUserId;
+      perm.GrantedUserId = Guid.NewGuid();
+      perm.Permission = Permission.Write;
+      dao.AddHiveExperimentPermission(perm);
+
+      DT.HiveExperiment heLoaded = dao.GetHiveExperiment(he.Id);
+      Assert.AreEqual(he.Id, heLoaded.Id);
+      Assert.AreEqual(he.Name, heLoaded.Name);
+      Assert.AreEqual(he.ResourceNames, heLoaded.ResourceNames);
+      Assert.AreEqual(he.RootJobId, heLoaded.RootJobId);
+      //Assert.AreEqual(he.LastAccessed, heLoaded.LastAccessed);
+      //Assert.AreEqual(he.DateCreated, heLoaded.DateCreated);
+      
+      DT.Job jobLoaded = dao.GetJob(he.RootJobId);
+      Assert.AreEqual(job.Id, jobLoaded.Id);
+      Assert.AreEqual(job.State, jobLoaded.State);
+
+      DT.HiveExperimentPermission permLoaded = dao.GetHiveExperimentPermission(he.Id, perm.GrantedUserId);
+      Assert.AreEqual(perm.HiveExperimentId, permLoaded.HiveExperimentId);
+      Assert.AreEqual(perm.GrantedUserId, permLoaded.GrantedUserId);
+      Assert.AreEqual(perm.GrantedByUserId, permLoaded.GrantedByUserId);
+      Assert.AreEqual(perm.Permission, permLoaded.Permission);
+
+      dao.DeleteHiveExperiment(he.Id);
+      Assert.AreEqual(null, dao.GetHiveExperiment(he.Id));
+      Assert.AreEqual(null, dao.GetJob(he.RootJobId));
+      Assert.AreEqual(null, dao.GetHiveExperimentPermission(perm.HiveExperimentId, perm.GrantedUserId));
+
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Clients.Hive;
 using HeuristicLab.Clients.Hive.Slave.Tests;
+using HeuristicLab.Hive;
+using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading;
-using HeuristicLab.Hive;
-using HeuristicLab.Services.Hive.Common;
 
 namespace HeuristicLab.Services.Hive.Tests {
 
+  using System.Diagnostics;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using System.Diagnostics;
 
   [TestClass]
@@ -54 +54 @@
       var service = GetLocalService();
 
+      // create hive experiment
       DT.HiveExperiment experiment = new DT.HiveExperiment() {
         Name = "TestExperiment",
@@ -59 +60 @@
       };
 
+      // create job
       DT.Job job = new DT.Job() {
         CoresNeeded = 1,
@@ -64 +66 @@
         Priority = 0
       };
+      job.SetState(JobState.Offline);
 
       DT.JobData jobData = new DT.JobData() {
-        Data = PersistenceUtil.Serialize(new MockJob(500, true))
+        //Data = PersistenceUtil.Serialize(new MockJob(500, true))
+        Data = new byte[10000000]
       };
 
+      // create plugin
       DT.Plugin plugin1 = new DT.Plugin();
       plugin1.Name = "Tests.MyPlugin";
@@ -77 +82 @@
 
       DT.PluginData pluginData1 = new DT.PluginData();
-      pluginData1.PluginId = plugin1.Id;
       pluginData1.FileName = "Tests.MyPlugin-1.0.dll";
       pluginData1.Data = new byte[] { 0, 1, 2, 3, 4, 5 };
 
+      plugin1.Id = service.AddPlugin(plugin1, new List<PluginData> { pluginData1 });
+      pluginData1.PluginId = plugin1.Id;
+
+      // add plugin
       job.PluginsNeededIds.Add(plugin1.Id);
 
-      job.Id = service.AddJob(job, jobData, null);
+      // create slave
+      DT.Slave slave = new Slave();
+      slave.Id = Guid.NewGuid();
+      slave.Name = "TestSlave";
+      slave.Memory = 1024;
+      slave.Cores = 4;
+      slave.CpuSpeed = 2800;
+      slave.OperatingSystem = "Windows 3.11";
+      slave.CpuArchitecture = CpuArchitecture.x64;
+
+      // add slave
+      service.AddSlave(slave);
+
+      // add job
+      job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
       experiment.RootJobId = job.Id;
 
+      // add hive experiment
+      experiment.Id = service.AddHiveExperiment(experiment);
+
+      // test job
       DT.Job jobLoaded = service.GetJob(job.Id);
       Assert.AreEqual(job.Id, jobLoaded.Id);
@@ -91 +117 @@
       Assert.AreEqual(job.MemoryNeeded, jobLoaded.MemoryNeeded);
       Assert.AreEqual(job.Priority, jobLoaded.Priority);
-      Assert.AreEqual(JobState.Waiting, jobLoaded.JobState);
-      Assert.AreEqual(ServiceLocator.Instance.AuthorizationManager.UserId, job.UserId);
+      Assert.AreEqual(JobState.Waiting, jobLoaded.State);
       Assert.IsTrue(job.PluginsNeededIds.SequenceEqual(jobLoaded.PluginsNeededIds));
-
+      
       DT.JobData jobDataLoaded = service.GetJobData(job.Id);
       Assert.AreEqual(job.Id, jobDataLoaded.JobId);
       Assert.IsTrue(jobData.Data.SequenceEqual(jobDataLoaded.Data));
 
-      experiment.Id = service.AddHiveExperiment(experiment);
-
+      // test hive experiment
       DT.HiveExperiment experimentLoaded = service.GetHiveExperiment(experiment.Id);
       Assert.AreEqual(experiment.Id, experimentLoaded.Id);
@@ -107 +131 @@
       Assert.AreEqual(experiment.RootJobId, experimentLoaded.RootJobId);
 
+      // test assigned ressources
+      var actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 4, FreeMemory = 1024, JobProgress = new Dictionary<Guid,TimeSpan>() });
+      Assert.AreEqual(1, actions.Count);
+      Assert.AreEqual(MessageContainer.MessageType.CalculateJob, actions[0].Message);
+      Assert.AreEqual(job.Id, actions[0].JobId);
+
+      jobLoaded = service.GetJob(job.Id);
+      Assert.AreEqual(JobState.Transferring, jobLoaded.State);
+
+      // send progress
+      var progress = new Dictionary<Guid, TimeSpan>();
+      progress.Add(job.Id, new TimeSpan(1, 5, 10, 20, 30));
+      actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 3, FreeMemory = 1024, JobProgress = progress });
+      Assert.AreEqual(0, actions.Count);
+
+      // the job should be in state 'Calculating' now
+      jobLoaded = service.GetJob(job.Id);
+      Assert.AreEqual(JobState.Calculating, jobLoaded.State);
+      Assert.AreEqual(new TimeSpan(1, 5, 10, 20, 30), jobLoaded.ExecutionTime.Value);
+
+      // delete
       service.DeleteHiveExperiment(experiment.Id);
       Assert.AreEqual(null, service.GetHiveExperiment(experiment.Id));
       Assert.AreEqual(null, service.GetJob(job.Id));
       Assert.AreEqual(null, service.GetJobData(job.Id));
+
+      // send another heartbeat with the deleted job; the server should command the abortion of the job
+      actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 3, FreeMemory = 1024, JobProgress = progress });
+      Assert.AreEqual(1, actions.Count);
+      Assert.AreEqual(MessageContainer.MessageType.AbortJob, actions[0].Message);
+      Assert.AreEqual(job.Id, actions[0].JobId);
+
+      // delete slave
+      service.DeleteSlave(slave.Id);
     }
 
@@ -185 +239 @@
         Thread.Sleep(500);
         lightweightJobs = service.GetLightweightJobs(jobs.Select(x => x.Id));
-      } while (!lightweightJobs.All(x => x.JobState == JobState.Finished));
+      } while (!lightweightJobs.All(x => x.State == JobState.Finished));
 
       // delete slaves
@@ -239 +293 @@
             IJob deserializedJob = PersistenceUtil.Deserialize<IJob>(jobData.Data);
             deserializedJob.Start();
-            job.JobState = JobState.Finished;
-            jobs.Where(x => x.Id == job.Id).Single().JobState = JobState.Finished;
+            job.SetState(JobState.Finished);
+            jobs.Where(x => x.Id == job.Id).Single().SetState(JobState.Finished);
             jobData.Data = PersistenceUtil.Serialize(deserializedJob);
-            service.UpdateJob(job, jobData);
+            service.UpdateJobData(job, jobData);
             Debug.WriteLine("finished calculating");
           }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/App_Code/HiveServerModule.cs

@@ -28 +28 @@
 using HeuristicLab.Services.Hive;
 using HeuristicLab.Tracing;
+using HeuristicLab.Services.Hive.Common;
 
 namespace HeuristicLab.Hive.Server.Core.IISModules {
   public class HiveServerModule : IHttpModule {
-    
     private static IHiveService hiveService;
     private static ILifecycleManager lifecycleManager;
 
     public void Init(HttpApplication context) {
-      if (lifecycleManager == null)
+      if (lifecycleManager == null) {
         lifecycleManager = new LifecycleManager();
-      lifecycleManager.Start();
+        lifecycleManager.Start();
+        LogFactory.GetLogger(this.GetType().Name).Log("Init(): LifecycleManager started");
+      }
     }
 
     public void Dispose() {
       lifecycleManager.Stop();
+      lifecycleManager = null;
+      LogFactory.GetLogger(this.GetType().Name).Log("Init(): LifecycleManager stopped");
     } 
   }

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

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Security;
 using System.Web.Security;
@@ -35 +34 @@
     }
 
-    public void AuthorizeJobs(params Guid[] jobIds) {
-      if (!IsAuthorizedForJobs(jobIds)) {
-        throw new SecurityException("User '" + Identity.UserName + "' is not authorized to access job (Id: " + string.Join(", ", jobIds.Select(x => x.ToString()).ToArray()) + ")");
-      }
-    }
+    //public void AuthorizeJobs(params Guid[] jobIds) {
+    //  if (!IsAuthorizedForJobs(jobIds)) {
+    //    throw new SecurityException("User '" + Identity.UserName + "' is not authorized to access job (Id: " + string.Join(", ", jobIds.Select(x => x.ToString()).ToArray()) + ")");
+    //  }
+    //}
 
-    private bool IsAuthorizedForJobs(params Guid[] jobIds) {
-      return ServiceLocator.Instance.HiveDao.IsUserAuthorizedForJobs(UserId, jobIds);
-    }
+    //private bool IsAuthorizedForJobs(params Guid[] jobIds) {
+    //  return ServiceLocator.Instance.HiveDao.IsUserAuthorizedForJobs(UserId, jobIds);
+    //}
 
     public void Authorize(Guid userId) {

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
@@ -54 +53 @@
 
     private void AssignJob(Slave slave, Job job) {
-      job.SlaveId = slave.Id;
-      job.JobState = JobState.Calculating; // Todo: Maybe use State = Transferring (?)
-      job.DateCalculated = DateTime.Now; // Todo: use statelog instead
+      job.SetState(JobState.Transferring, slave.Id, "");
       dao.UpdateJob(job);
       dao.UpdateSlave(slave);
@@ -79 +76 @@
           Logger.Error("Job does not exist in DB: " + jobProgress.Key);
         } else {
-          if (curJob.SlaveId == Guid.Empty || curJob.SlaveId != heartbeat.SlaveId) {
+          if (curJob.CurrentStateLog.SlaveId == Guid.Empty || curJob.CurrentStateLog.SlaveId != heartbeat.SlaveId) {
             // assigned slave does not match heartbeat
             actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
@@ -88 +85 @@
             curJob.LastHeartbeat = DateTime.Now;
 
-            if (curJob.JobState == JobState.Aborted) {
+            if (curJob.State == JobState.Aborted) {
               // a request to abort the job has been set
               actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
+            } else if (curJob.State != JobState.Calculating) {
+              // jobstate was 'Transferring' before, now calculating
+              curJob.SetState(JobState.Calculating, heartbeat.SlaveId, "");
             }
             dao.UpdateJob(curJob);

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

@@ -33 +33 @@
     //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
-    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> slaveGroupIds) {
-      using (trans.OpenTransaction()) {
-        job.UserId = auth.UserId;
-        job.DateCreated = DateTime.Now;
-        job.JobState = JobState.Waiting;
+    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
+      using (trans.OpenTransaction()) {
+        job.SetState(JobState.Waiting, auth.UserId);
         job.Id = dao.AddJob(job);
         jobData.JobId = job.Id;
         jobData.LastUpdate = DateTime.Now;
-        if (slaveGroupIds != null) {
-          foreach (Guid slaveGroupId in slaveGroupIds) {
+        if (resourceIds != null) {
+          foreach (Guid slaveGroupId in resourceIds) {
             dao.AssignJobToResource(job.Id, slaveGroupId);
           }
@@ -80 +78 @@
     }
 
-    public void UpdateJob(Job job, JobData jobData) {
+    public void UpdateJob(Job job) {
+      using (trans.OpenTransaction()) {
+        dao.UpdateJob(job);
+      }
+    }
+
+    public void UpdateJobData(Job job, JobData jobData) {
       using (trans.OpenTransaction()) {
         jobData.LastUpdate = DateTime.Now;
@@ -122 +126 @@
 
     public HiveExperiment GetHiveExperiment(Guid id) {
-      return dao.GetHiveExperiments(x => x.UserId == auth.UserId && x.HiveExperimentId == id).FirstOrDefault();
+      return dao.GetHiveExperiments(x =>
+             x.HiveExperimentId == id
+          && (x.OwnerUserId == auth.UserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == auth.UserId) > 0)
+          ).FirstOrDefault();
     }
 
     public IEnumerable<HiveExperiment> GetHiveExperiments() {
-      return dao.GetHiveExperiments(x => x.UserId == auth.UserId);
+      return dao.GetHiveExperiments(x => x.OwnerUserId == auth.UserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == auth.UserId) > 0);
     }
 
     public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
       using (trans.OpenTransaction()) {
-        hiveExperimentDto.UserId = auth.UserId;
+        hiveExperimentDto.OwnerUserId = auth.UserId;
         hiveExperimentDto.DateCreated = DateTime.Now;
         return dao.AddHiveExperiment(hiveExperimentDto);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IAuthorizationManager.cs

@@ -33 +33 @@
     /// </summary>
     /// <exception cref="SecurityException">thrown when access denied</exception>
-    void AuthorizeJobs(params Guid[] jobId);
+    //void AuthorizeJobs(params Guid[] jobId);
 
     /// <summary>

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Transactions;
+using HeuristicLab.Core;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Tracing;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Services.Hive {
@@ -27 +23 @@
 
     // Windows-Forms timer is single threaded, so callbacks will be synchron
-    System.Windows.Forms.Timer timer;
+    private System.Windows.Forms.Timer timer;
 
     public ExecutionState ExecutionState {
@@ -40 +36 @@
     public void Start() {
       if (ExecutionState == Core.ExecutionState.Stopped) {
-        this.timer.Interval = (int)new TimeSpan(0, 0, 10).TotalMilliseconds;
+        this.timer.Interval = (int)new TimeSpan(0, 0, 30).TotalMilliseconds;
         this.timer.Start();
       }
@@ -71 +67 @@
 
     private void AbortJobs(Guid slaveId) {
-      var jobs = dao.GetJobs(x => x.Slave.ResourceId == slaveId);
+      var jobs = dao.GetJobs(x => x.StateLogs.Last().SlaveId == slaveId);
       foreach (var j in jobs) {
-        j.JobState = JobState.Waiting;
+        j.StateLog.Add(new StateLog() { 
+          UserId = auth.UserId, 
+          State = JobState.Waiting,
+          JobId = j.Id,
+          DateTime = DateTime.Now,
+          Exception = "Slave timed out"
+        });
         dao.UpdateJob(j);
       }