Changeset 6743 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3

Timestamp:

09/12/11 18:04:25 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed a bug in the Slave UI
• finished renaming Webservice and Dao methods to be consistent with Job/Task naming
• some cosmetic changes and project dependencies cleanups

Location:

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

Files:

• ConcurrentTaskDownloader.cs (modified) (4 diffs)
• HiveClient.cs (modified) (20 diffs)
• HiveJobs/HiveTask.cs (modified) (4 diffs)
• JobResultPoller.cs (modified) (1 diff)
• RefreshableJob.cs (modified) (16 diffs)
• ServiceClients/HiveServiceClient.cs (modified) (8 diffs)
• ServiceClients/LightweightTask.cs (modified) (2 diffs)
• TaskDownloader.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs

@@ -42 +42 @@
     }
 
-    public void DownloadJob(Task job, Action<Task, T> onFinishedAction) {
-      Task<T> task = Task<TaskData>.Factory.StartNew((x) => DownloadJob(x), job.Id)
-                                     .ContinueWith((x) => DeserializeJob(x.Result));
-      task.ContinueWith((x) => OnJobFinished(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
-      task.ContinueWith((x) => OnJobFailed(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
+    public void DownloadTask(Task job, Action<Task, T> onFinishedAction) {
+      Task<T> task = Task<TaskData>.Factory.StartNew((x) => DownloadTask(x), job.Id)
+                                     .ContinueWith((x) => DeserializeTask(x.Result));
+      task.ContinueWith((x) => OnTaskFinished(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
+      task.ContinueWith((x) => OnTaskFailed(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
 
-    private void OnJobFinished(Task job, Task<T> task, Action<Task, T> onFinishedAction) {
+    private void OnTaskFinished(Task job, Task<T> task, Action<Task, T> onFinishedAction) {
       onFinishedAction(job, task.Result);
     }
-    private void OnJobFailed(Task job, Task<T> task, Action<Task, T> onFinishedAction) {
+    private void OnTaskFailed(Task job, Task<T> task, Action<Task, T> onFinishedAction) {
       task.Exception.Flatten().Handle((e) => { return true; });
       OnExceptionOccured(task.Exception.Flatten());
@@ -58 +58 @@
     }
 
-    protected TaskData DownloadJob(object jobId) {
+    protected TaskData DownloadTask(object taskId) {
       downloadSemaphore.WaitOne();
       deserializeSemaphore.WaitOne();
@@ -64 +64 @@
       try {
         if (abort) return null;
-        result = ServiceLocator.Instance.CallHiveService(s => s.GetJobData((Guid)jobId));
+        result = ServiceLocator.Instance.CallHiveService(s => s.GetTaskData((Guid)taskId));
       }
       finally {
@@ -72 +72 @@
     }
 
-    protected T DeserializeJob(TaskData jobData) {
+    protected T DeserializeTask(TaskData taskData) {
       try {
-        if (abort || jobData == null) return null;
-        Task job = ServiceLocator.Instance.CallHiveService(s => s.GetJob(jobData.TaskId));
-        if (job == null) return null;
-        var deserializedJob = PersistenceUtil.Deserialize<T>(jobData.Data);
-        jobData.Data = null; // reduce memory consumption.
+        if (abort || taskData == null) return null;
+        Task task = ServiceLocator.Instance.CallHiveService(s => s.GetTask(taskData.TaskId));
+        if (task == null) return null;
+        var deserializedJob = PersistenceUtil.Deserialize<T>(taskData.Data);
+        taskData.Data = null; // reduce memory consumption.
         return deserializedJob;
       }

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

@@ -86 +86 @@
         var oldExperiments = jobs ?? new ItemCollection<RefreshableJob>();
         jobs = new HiveItemCollection<RefreshableJob>();
-        var experimentsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetHiveExperiments());
+        var experimentsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
 
         foreach (var he in experimentsLoaded) {
-          var hiveExperiment = oldExperiments.SingleOrDefault(x => x.Id == he.Id);
-          if (hiveExperiment == null) {
+          var job = oldExperiments.SingleOrDefault(x => x.Id == he.Id);
+          if (job == null) {
             // new
             jobs.Add(new RefreshableJob(he) { IsAllowedPrivileged = this.isAllowedPrivileged });
           } else {
             // update
-            hiveExperiment.Job = he;
-            hiveExperiment.IsAllowedPrivileged = this.isAllowedPrivileged;
-            jobs.Add(hiveExperiment);
+            job.Job = he;
+            job.IsAllowedPrivileged = this.isAllowedPrivileged;
+            jobs.Add(job);
           }
         }
@@ -139 +139 @@
       if (item.Id == Guid.Empty) {
         if (item is RefreshableJob) {
-          HiveClient.Instance.UploadExperiment((RefreshableJob)item, cancellationToken);
+          HiveClient.Instance.UploadJob((RefreshableJob)item, cancellationToken);
         }
         if (item is JobPermission) {
@@ -151 +151 @@
       } else {
         if (item is Job)
-          ServiceLocator.Instance.CallHiveService(s => s.UpdateHiveExperiment((Job)item));
+          ServiceLocator.Instance.CallHiveService(s => s.UpdateJob((Job)item));
       }
     }
@@ -177 +177 @@
 
       if (item is Job)
-        ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(item.Id));
+        ServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
       if (item is RefreshableJob)
-        ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(item.Id));
+        ServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
       if (item is JobPermission) {
         var hep = (JobPermission)item;
@@ -206 +206 @@
     #endregion
 
-    public static void StartExperiment(Action<Exception> exceptionCallback, RefreshableJob refreshableJob, CancellationToken cancellationToken) {
+    public static void StartJob(Action<Exception> exceptionCallback, RefreshableJob refreshableJob, CancellationToken cancellationToken) {
       HiveClient.StoreAsync(
         new Action<Exception>((Exception ex) => {
@@ -215 +215 @@
     }
 
-    public static void PauseExperiment(RefreshableJob refreshableHiveExperiment) {
+    public static void PauseJob(RefreshableJob refreshableJob) {
       ServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveTask job in refreshableHiveExperiment.GetAllHiveJobs()) {
-          if (job.Task.State != TaskState.Finished && job.Task.State != TaskState.Aborted && job.Task.State != TaskState.Failed)
-            service.PauseJob(job.Task.Id);
+        foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
+          if (task.Task.State != TaskState.Finished && task.Task.State != TaskState.Aborted && task.Task.State != TaskState.Failed)
+            service.PauseTask(task.Task.Id);
         }
       });
-      refreshableHiveExperiment.ExecutionState = ExecutionState.Paused;
-    }
-
-    public static void StopExperiment(RefreshableJob refreshableJob) {
+      refreshableJob.ExecutionState = ExecutionState.Paused;
+    }
+
+    public static void StopJob(RefreshableJob refreshableJob) {
       ServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveTask job in refreshableJob.GetAllHiveJobs()) {
-          if (job.Task.State != TaskState.Finished && job.Task.State != TaskState.Aborted && job.Task.State != TaskState.Failed)
-            service.StopJob(job.Task.Id);
+        foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
+          if (task.Task.State != TaskState.Finished && task.Task.State != TaskState.Aborted && task.Task.State != TaskState.Failed)
+            service.StopTask(task.Task.Id);
         }
       });
@@ -235 +235 @@
     }
 
-    #region Upload Experiment
+    #region Upload Job
     private Semaphore jobUploadSemaphore = new Semaphore(4, 4); // todo: take magic number into config
     private static object jobCountLocker = new object();
     private static object pluginLocker = new object();
-    private void UploadExperiment(RefreshableJob refreshableJob, CancellationToken cancellationToken) {
+    private void UploadJob(RefreshableJob refreshableJob, CancellationToken cancellationToken) {
       try {
         refreshableJob.Progress = new Progress("Connecting to server...");
@@ -254 +254 @@
         }
 
-        foreach (OptimizerHiveTask hiveJob in refreshableJob.HiveJobs.OfType<OptimizerHiveTask>()) {
+        foreach (OptimizerHiveTask hiveJob in refreshableJob.HiveTasks.OfType<OptimizerHiveTask>()) {
           hiveJob.SetIndexInParentOptimizerList(null);
         }
@@ -260 +260 @@
         // upload Task
         refreshableJob.Progress.Status = "Uploading Task...";
-        refreshableJob.Job.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddHiveExperiment(refreshableJob.Job));
+        refreshableJob.Job.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job));
         bool isPrivileged = refreshableJob.Job.IsPrivileged;
-        refreshableJob.Job = ServiceLocator.Instance.CallHiveService((s) => s.GetHiveExperiment(refreshableJob.Job.Id)); // update owner and permissions
+        refreshableJob.Job = ServiceLocator.Instance.CallHiveService((s) => s.GetJob(refreshableJob.Job.Id)); // update owner and permissions
         refreshableJob.Job.IsPrivileged = isPrivileged;
         cancellationToken.ThrowIfCancellationRequested();
 
-        int totalJobCount = refreshableJob.GetAllHiveJobs().Count();
+        int totalJobCount = refreshableJob.GetAllHiveTasks().Count();
         int[] jobCount = new int[1]; // use a reference type (int-array) instead of value type (int) in order to pass the value via a delegate to task-parallel-library
         cancellationToken.ThrowIfCancellationRequested();
@@ -284 +284 @@
 
         var tasks = new List<TS.Task>();
-        foreach (HiveTask hiveJob in refreshableJob.HiveJobs) {
+        foreach (HiveTask hiveJob in refreshableJob.HiveTasks) {
           tasks.Add(TS.Task.Factory.StartNew((hj) => {
-            UploadJobWithChildren(refreshableJob.Progress, (HiveTask)hj, null, resourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, refreshableJob.Job.IsPrivileged, cancellationToken);
+            UploadTaskWithChildren(refreshableJob.Progress, (HiveTask)hj, null, resourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, refreshableJob.Job.IsPrivileged, cancellationToken);
           }, hiveJob)
           .ContinueWith((x) => refreshableJob.Log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
@@ -334 +334 @@
     /// </summary>
     /// <param name="parentHiveTask">shall be null if its the root task</param>
-    private void UploadJobWithChildren(IProgress progress, HiveTask hiveJob, HiveTask parentHiveJob, IEnumerable<Guid> groups, int[] jobCount, int totalJobCount, Guid configPluginId, Guid hiveExperimentId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
+    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveJob, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
       jobUploadSemaphore.WaitOne();
       bool semaphoreReleased = false;
@@ -340 +340 @@
         cancellationToken.ThrowIfCancellationRequested();
         lock (jobCountLocker) {
-          jobCount[0]++;
+          taskCount[0]++;
         }
         TaskData jobData;
         List<IPluginDescription> plugins;
 
-        if (hiveJob.ItemTask.ComputeInParallel && (hiveJob.ItemTask.Item is Optimization.Experiment || hiveJob.ItemTask.Item is Optimization.BatchRun)) {
-          hiveJob.Task.IsParentTask = true;
-          hiveJob.Task.FinishWhenChildJobsFinished = true;
-          jobData = hiveJob.GetAsTaskData(true, out plugins);
+        if (hiveTask.ItemTask.ComputeInParallel && (hiveTask.ItemTask.Item is Optimization.Experiment || hiveTask.ItemTask.Item is Optimization.BatchRun)) {
+          hiveTask.Task.IsParentTask = true;
+          hiveTask.Task.FinishWhenChildJobsFinished = true;
+          jobData = hiveTask.GetAsTaskData(true, out plugins);
         } else {
-          hiveJob.Task.IsParentTask = false;
-          hiveJob.Task.FinishWhenChildJobsFinished = false;
-          jobData = hiveJob.GetAsTaskData(false, out plugins);
+          hiveTask.Task.IsParentTask = false;
+          hiveTask.Task.FinishWhenChildJobsFinished = false;
+          jobData = hiveTask.GetAsTaskData(false, out plugins);
         }
         cancellationToken.ThrowIfCancellationRequested();
@@ -359 +359 @@
           if (!cancellationToken.IsCancellationRequested) {
             lock (pluginLocker) {
-              ServiceLocator.Instance.CallHiveService((s) => hiveJob.Task.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+              ServiceLocator.Instance.CallHiveService((s) => hiveTask.Task.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
             }
           }
         }, -1, "Failed to upload plugins");
         cancellationToken.ThrowIfCancellationRequested();
-        hiveJob.Task.PluginsNeededIds.Add(configPluginId);
-        hiveJob.Task.JobId = hiveExperimentId;
-        hiveJob.Task.IsPrivileged = isPrivileged;
-
-        log.LogMessage(string.Format("Uploading task ({0} kb, {1} objects)", jobData.Data.Count() / 1024, hiveJob.ItemTask.GetObjectGraphObjects().Count()));
+        hiveTask.Task.PluginsNeededIds.Add(configPluginId);
+        hiveTask.Task.JobId = jobId;
+        hiveTask.Task.IsPrivileged = isPrivileged;
+
+        log.LogMessage(string.Format("Uploading task ({0} kb, {1} objects)", jobData.Data.Count() / 1024, hiveTask.ItemTask.GetObjectGraphObjects().Count()));
         TryAndRepeat(() => {
           if (!cancellationToken.IsCancellationRequested) {
             if (parentHiveJob != null) {
-              hiveJob.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddChildJob(parentHiveJob.Task.Id, hiveJob.Task, jobData));
+              hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveJob.Task.Id, hiveTask.Task, jobData));
             } else {
-              hiveJob.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddJob(hiveJob.Task, jobData, groups.ToList()));
+              hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, jobData, groups.ToList()));
             }
           }
@@ -381 +381 @@
 
         lock (jobCountLocker) {
-          progress.ProgressValue = (double)jobCount[0] / totalJobCount;
-          progress.Status = string.Format("Uploaded task ({0} of {1})", jobCount[0], totalJobCount);
+          progress.ProgressValue = (double)taskCount[0] / totalJobCount;
+          progress.Status = string.Format("Uploaded task ({0} of {1})", taskCount[0], totalJobCount);
         }
 
         var tasks = new List<TS.Task>();
-        foreach (HiveTask child in hiveJob.ChildHiveTasks) {
+        foreach (HiveTask child in hiveTask.ChildHiveTasks) {
           tasks.Add(TS.Task.Factory.StartNew((tuple) => {
             var arguments = (Tuple<HiveTask, HiveTask>)tuple;
-            UploadJobWithChildren(progress, arguments.Item1, arguments.Item2, groups, jobCount, totalJobCount, configPluginId, hiveExperimentId, log, isPrivileged, cancellationToken);
-          }, new Tuple<HiveTask, HiveTask>(child, hiveJob))
+            UploadTaskWithChildren(progress, arguments.Item1, arguments.Item2, groups, taskCount, totalJobCount, configPluginId, jobId, log, isPrivileged, cancellationToken);
+          }, new Tuple<HiveTask, HiveTask>(child, hiveTask))
           .ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
         }
@@ -408 +408 @@
 
     #region Download Experiment
-    public static void LoadExperiment(RefreshableJob refreshableJob) {
+    public static void LoadJob(RefreshableJob refreshableJob) {
       var hiveExperiment = refreshableJob.Job;
       refreshableJob.Progress = new Progress();
@@ -415 +415 @@
         refreshableJob.IsProgressing = true;
         int totalJobCount = 0;
-        IEnumerable<LightweightTask> allJobs;
+        IEnumerable<LightweightTask> allTasks;
 
         refreshableJob.Progress.Status = "Connecting to Server...";
         // fetch all Task objects to create the full tree of tree of HiveTask objects
         refreshableJob.Progress.Status = "Downloading list of jobs...";
-        allJobs = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightExperimentJobs(hiveExperiment.Id));
-        totalJobCount = allJobs.Count();
-
-        TaskDownloader downloader = new TaskDownloader(allJobs.Select(x => x.Id));
+        allTasks = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasks(hiveExperiment.Id));
+        totalJobCount = allTasks.Count();
+
+        TaskDownloader downloader = new TaskDownloader(allTasks.Select(x => x.Id));
         downloader.StartAsync();
 
@@ -435 +435 @@
           }
         }
-        IDictionary<Guid, HiveTask> allHiveJobs = downloader.Results;
-
-        refreshableJob.HiveJobs = new ItemCollection<HiveTask>(allHiveJobs.Values.Where(x => !x.Task.ParentTaskId.HasValue));
+        IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results;
+
+        refreshableJob.HiveTasks = new ItemCollection<HiveTask>(allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue));
 
         if (refreshableJob.IsFinished()) {
@@ -446 +446 @@
 
         // build child-task tree
-        foreach (HiveTask hiveJob in refreshableJob.HiveJobs) {
-          BuildHiveJobTree(hiveJob, allJobs, allHiveJobs);
+        foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
+          BuildHiveJobTree(hiveTask, allTasks, allHiveTasks);
         }
 
@@ -482 +482 @@
 
     public static ItemTask LoadItemJob(Guid jobId) {
-      TaskData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetJobData(jobId));
+      TaskData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetTaskData(jobId));
       try {
         return PersistenceUtil.Deserialize<ItemTask>(jobData.Data);
@@ -506 +506 @@
     }
 
-    public static HiveItemCollection<JobPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) {
+    public static HiveItemCollection<JobPermission> GetJobPermissions(Guid jobId) {
       return ServiceLocator.Instance.CallHiveService((service) => {
-        IEnumerable<JobPermission> heps = service.GetHiveExperimentPermissions(hiveExperimentId);
-        foreach (var hep in heps) {
+        IEnumerable<JobPermission> jps = service.GetJobPermissions(jobId);
+        foreach (var hep in jps) {
           hep.GrantedUserName = service.GetUsernameByUserId(hep.GrantedUserId);
         }
-        return new HiveItemCollection<JobPermission>(heps);
+        return new HiveItemCollection<JobPermission>(jps);
       });
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

@@ -341 +341 @@
 
     /// <summary>
-    /// Returns a list of HiveJobs including this and all its child-jobs recursively
+    /// Returns a list of HiveTasks including this and all its child-jobs recursively
     /// </summary>
     public IEnumerable<HiveTask> GetAllHiveTasks() {
@@ -453 +453 @@
         try {
           foreach (var child in childHiveTasks) {
-            ServiceLocator.Instance.CallHiveService(s => s.PauseJob(child.task.Id));
+            ServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
           }
         }
         finally { childHiveTasksLock.ExitReadLock(); }
       } else {
-        ServiceLocator.Instance.CallHiveService(s => s.PauseJob(this.task.Id));
+        ServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
       }
     }
@@ -467 +467 @@
         try {
           foreach (var child in childHiveTasks) {
-            ServiceLocator.Instance.CallHiveService(s => s.StopJob(child.task.Id));
+            ServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
           }
         }
         finally { childHiveTasksLock.ExitReadLock(); }
       } else {
-        ServiceLocator.Instance.CallHiveService(s => s.StopJob(this.task.Id));
+        ServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
       }
     }
@@ -481 +481 @@
         taskData.TaskId = this.task.Id;
         taskData.Data = PersistenceUtil.Serialize(this.itemTask);
-        service.UpdateJobData(this.Task, taskData);
-        service.RestartJob(this.task.Id);
-        Task job = service.GetJob(this.task.Id);
-        this.task.LastJobDataUpdate = job.LastJobDataUpdate;
+        service.UpdateTaskData(this.Task, taskData);
+        service.RestartTask(this.task.Id);
+        Task task = service.GetTask(this.task.Id);
+        this.task.LastTaskDataUpdate = task.LastTaskDataUpdate;
       });
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

@@ -108 +108 @@
       return ServiceLocator.Instance.CallHiveService(service => {
         var responses = new List<LightweightTask>();
-        responses.AddRange(service.GetLightweightExperimentJobs(jobId));
+        responses.AddRange(service.GetLightweightJobTasks(jobId));
         OnJobResultsReceived(responses);
         return responses;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -55 +55 @@
     }
 
-    private ItemCollection<HiveTask> hiveJobs;
-    public ItemCollection<HiveTask> HiveJobs {
-      get { return hiveJobs; }
+    private ItemCollection<HiveTask> hiveTasks;
+    public ItemCollection<HiveTask> HiveTasks {
+      get { return hiveTasks; }
       set {
-        if (hiveJobs != value) {
-          if (hiveJobs != null) DeregisterHiveJobsEvents();
-          hiveJobs = value;
-          if (hiveJobs != null) RegisterHiveJobsEvents();
+        if (hiveTasks != value) {
+          if (hiveTasks != null) DeregisterHiveJobsEvents();
+          hiveTasks = value;
+          if (hiveTasks != null) RegisterHiveJobsEvents();
           OnHiveJobsChanged();
         }
@@ -100 +100 @@
           }
           if (RefreshAutomatically) {
-            if (this.HiveJobs != null && this.HiveJobs.Count > 0 && (jobResultPoller == null || !jobResultPoller.IsPolling)) {
+            if (this.HiveTasks != null && this.HiveTasks.Count > 0 && (jobResultPoller == null || !jobResultPoller.IsPolling)) {
               StartResultPolling();
             }
@@ -130 +130 @@
           isControllable = value;
           OnIsControllableChanged();
-          if (this.hiveJobs != null) {
-            foreach (var hiveJob in this.hiveJobs) {
+          if (this.hiveTasks != null) {
+            foreach (var hiveJob in this.hiveTasks) {
               hiveJob.IsControllable = value;
             }
@@ -186 +186 @@
 
     public StateLogListList StateLogList {
-      get { return new StateLogListList(this.GetAllHiveJobs().Select(x => x.StateLog)); }
+      get { return new StateLogListList(this.GetAllHiveTasks().Select(x => x.StateLog)); }
     }
 
@@ -196 +196 @@
       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
-      this.HiveJobs = new ItemCollection<HiveTask>();
+      this.HiveTasks = new ItemCollection<HiveTask>();
     }
     public RefreshableJob(Job hiveExperiment) {
@@ -204 +204 @@
       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
-      this.HiveJobs = new ItemCollection<HiveTask>();
+      this.HiveTasks = new ItemCollection<HiveTask>();
     }
     protected RefreshableJob(RefreshableJob original, Cloner cloner) {
@@ -214 +214 @@
       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
-      this.HiveJobs = cloner.Clone(original.HiveJobs);
+      this.HiveTasks = cloner.Clone(original.HiveTasks);
       this.ExecutionTime = original.ExecutionTime;
       this.ExecutionState = original.ExecutionState;
@@ -263 +263 @@
     }
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightTask>> e) {
-      foreach (LightweightTask lightweightJob in e.Value) {
-        HiveTask hiveJob = GetHiveJobById(lightweightJob.Id);
-        if (hiveJob != null) {
+      foreach (LightweightTask lightweightTask in e.Value) {
+        HiveTask hiveTask = GetHiveJobById(lightweightTask.Id);
+        if (hiveTask != null) {
           // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
-          if (hiveJob.Task.State == TaskState.Offline && lightweightJob.State != TaskState.Finished && lightweightJob.State != TaskState.Failed && lightweightJob.State != TaskState.Aborted) {
-            hiveJob.Task.LastJobDataUpdate = lightweightJob.LastJobDataUpdate;
+          if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State != TaskState.Finished && lightweightTask.State != TaskState.Failed && lightweightTask.State != TaskState.Aborted) {
+            hiveTask.Task.LastTaskDataUpdate = lightweightTask.LastTaskDataUpdate;
           }
 
-          hiveJob.UpdateFromLightweightJob(lightweightJob);
-
-          if (!hiveJob.IsFinishedTaskDownloaded && !hiveJob.IsDownloading && hiveJob.Task.LastJobDataUpdate < lightweightJob.LastJobDataUpdate) {
-            log.LogMessage(string.Format("Downloading task {0}", lightweightJob.Id));
-            hiveJob.IsDownloading = true;
-            jobDownloader.DownloadJob(hiveJob.Task, (localJob, itemJob) => {
+          hiveTask.UpdateFromLightweightJob(lightweightTask);
+
+          if (!hiveTask.IsFinishedTaskDownloaded && !hiveTask.IsDownloading && hiveTask.Task.LastTaskDataUpdate < lightweightTask.LastTaskDataUpdate) {
+            log.LogMessage(string.Format("Downloading task {0}", lightweightTask.Id));
+            hiveTask.IsDownloading = true;
+            jobDownloader.DownloadTask(hiveTask.Task, (localJob, itemJob) => {
               log.LogMessage(string.Format("Finished downloading task {0}", localJob.Id));
-              HiveTask localHiveJob = GetHiveJobById(localJob.Id);
+              HiveTask localHiveTask = GetHiveJobById(localJob.Id);
 
               if (itemJob == null) {
-                localHiveJob.IsDownloading = false;
+                localHiveTask.IsDownloading = false;
               }
 
@@ -290 +290 @@
 
                 if (localJob.State == TaskState.Paused) {
-                  localHiveJob.ItemTask = itemJob;
+                  localHiveTask.ItemTask = itemJob;
                 } else {
                   if (localJob.ParentTaskId.HasValue) {
-                    HiveTask parentHiveJob = GetHiveJobById(localJob.ParentTaskId.Value);
-                    parentHiveJob.IntegrateChild(itemJob, localJob.Id);
+                    HiveTask parentHiveTask = GetHiveJobById(localJob.ParentTaskId.Value);
+                    parentHiveTask.IntegrateChild(itemJob, localJob.Id);
                   } else {
-                    localHiveJob.ItemTask = itemJob;
+                    localHiveTask.ItemTask = itemJob;
                   }
                 }
-                localHiveJob.IsDownloading = false;
-                localHiveJob.Task.LastJobDataUpdate = localJob.LastJobDataUpdate;
+                localHiveTask.IsDownloading = false;
+                localHiveTask.Task.LastTaskDataUpdate = localJob.LastTaskDataUpdate;
               }
             });
@@ -317 +317 @@
 
     public HiveTask GetHiveJobById(Guid jobId) {
-      foreach (HiveTask job in this.HiveJobs) {
+      foreach (HiveTask job in this.HiveTasks) {
         var hj = job.GetHiveTaskByTaskId(jobId);
         if (hj != null)
@@ -325 +325 @@
     }
     private void UpdateStatistics() {
-      var jobs = this.GetAllHiveJobs();
+      var jobs = this.GetAllHiveTasks();
       job.JobCount = jobs.Count();
       job.CalculatingCount = jobs.Count(j => j.Task.State == TaskState.Calculating);
@@ -333 +333 @@
 
     public bool AllJobsFinished() {
-      return this.GetAllHiveJobs().All(j => (j.Task.State == TaskState.Finished
+      return this.GetAllHiveTasks().All(j => (j.Task.State == TaskState.Finished
                                                    || j.Task.State == TaskState.Aborted
                                                    || j.Task.State == TaskState.Failed)
@@ -346 +346 @@
     }
     public void UpdateTotalExecutionTime() {
-      this.ExecutionTime = TimeSpan.FromMilliseconds(this.GetAllHiveJobs().Sum(x => x.Task.ExecutionTime.TotalMilliseconds));
+      this.ExecutionTime = TimeSpan.FromMilliseconds(this.GetAllHiveTasks().Sum(x => x.Task.ExecutionTime.TotalMilliseconds));
     }
     #endregion
@@ -468 +468 @@
     #endregion
 
-    #region HiveJobs Events
+    #region HiveTasks Events
     private void RegisterHiveJobsEvents() {
-      this.hiveJobs.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsAdded);
-      this.hiveJobs.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsRemoved);
-      this.hiveJobs.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_CollectionReset);
+      this.hiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsAdded);
+      this.hiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsRemoved);
+      this.hiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_CollectionReset);
     }
 
     private void DeregisterHiveJobsEvents() {
-      this.hiveJobs.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsAdded);
-      this.hiveJobs.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsRemoved);
-      this.hiveJobs.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_CollectionReset);
+      this.hiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsAdded);
+      this.hiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_ItemsRemoved);
+      this.hiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(hiveJobs_CollectionReset);
     }
 
@@ -514 +514 @@
         DeregisterResultPollingEvents();
       }
-      if (this.HiveJobs != null && this.HiveJobs.Count > 0 && this.GetAllHiveJobs().All(x => x.Task.Id != Guid.Empty)) {
+      if (this.HiveTasks != null && this.HiveTasks.Count > 0 && this.GetAllHiveTasks().All(x => x.Task.Id != Guid.Empty)) {
         if (this.RefreshAutomatically)
           StartResultPolling();
@@ -581 +581 @@
 
     public bool IsFinished() {
-      return HiveJobs != null
-        && HiveJobs.All(x => x.Task.DateFinished.HasValue && x.Task.DateCreated.HasValue);
-    }
-
-    public IEnumerable<HiveTask> GetAllHiveJobs() {
-      if (hiveJobs == null) return Enumerable.Empty<HiveTask>();
-
-      var jobs = new List<HiveTask>();
-      foreach (HiveTask job in HiveJobs) {
-        jobs.AddRange(job.GetAllHiveTasks());
-      }
-      return jobs;
+      return HiveTasks != null
+        && HiveTasks.All(x => x.Task.DateFinished.HasValue && x.Task.DateCreated.HasValue);
+    }
+
+    public IEnumerable<HiveTask> GetAllHiveTasks() {
+      if (hiveTasks == null) return Enumerable.Empty<HiveTask>();
+
+      var tasks = new List<HiveTask>();
+      foreach (HiveTask task in HiveTasks) {
+        tasks.AddRange(task.GetAllHiveTasks());
+      }
+      return tasks;
     }
 

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

@@ -59 +59 @@
 
     public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
-
   }
 
@@ -77 +75 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
-    private System.DateTime LastJobDataUpdateField;
+    private System.DateTime LastTaskDataUpdateField;
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -115 +113 @@
 
     [System.Runtime.Serialization.DataMemberAttribute()]
-    public System.DateTime LastJobDataUpdate {
-      get {
-        return this.LastJobDataUpdateField;
-      }
-      set {
-        if ((this.LastJobDataUpdateField.Equals(value) != true)) {
-          this.LastJobDataUpdateField = value;
-          this.RaisePropertyChanged("LastJobDataUpdate");
+    public System.DateTime LastTaskDataUpdate {
+      get {
+        return this.LastTaskDataUpdateField;
+      }
+      set {
+        if ((this.LastTaskDataUpdateField.Equals(value) != true)) {
+          this.LastTaskDataUpdateField = value;
+          this.RaisePropertyChanged("LastTaskDataUpdate");
         }
       }
@@ -1577 +1575 @@
     System.Guid GetResourceId(string resourceName);
 
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJobsByResourceId", ReplyAction = "http://tempuri.org/IHiveService/GetJobsByResourceIdResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetJobsByResourceId(System.Guid resourceId);
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetTasksByResourceId", ReplyAction = "http://tempuri.org/IHiveService/GetTasksByResourceIdResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetTasksByResourceId(System.Guid resourceId);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/TriggerEventManager", ReplyAction = "http://tempuri.org/IHiveService/TriggerEventManagerResponse")]
@@ -1601 +1599 @@
     System.Guid GetUserIdByUsername(string username);
 
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddTask", ReplyAction = "http://tempuri.org/IHiveService/AddTaskResponse")]
+    System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData, System.Collections.Generic.List<System.Guid> resourceIds);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddChildTask", ReplyAction = "http://tempuri.org/IHiveService/AddChildTaskResponse")]
+    System.Guid AddChildTask(System.Guid parentTaskId, HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetTask", ReplyAction = "http://tempuri.org/IHiveService/GetTaskResponse")]
+    HeuristicLab.Clients.Hive.Task GetTask(System.Guid taskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetTasks", ReplyAction = "http://tempuri.org/IHiveService/GetTasksResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetTasks();
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetLightweightTasks", ReplyAction = "http://tempuri.org/IHiveService/GetLightweightTasksResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightTasks(System.Collections.Generic.List<System.Guid> taskIds);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetLightweightChildTasks", ReplyAction = "http://tempuri.org/IHiveService/GetLightweightChildTasksResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightChildTasks(System.Nullable<System.Guid> parentTaskId, bool recursive, bool includeParent);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetLightweightJobTasks", ReplyAction = "http://tempuri.org/IHiveService/GetLightweightJobTasksResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightJobTasks(System.Guid jobId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetTaskData", ReplyAction = "http://tempuri.org/IHiveService/GetTaskDataResponse")]
+    HeuristicLab.Clients.Hive.TaskData GetTaskData(System.Guid taskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateTask", ReplyAction = "http://tempuri.org/IHiveService/UpdateTaskResponse")]
+    void UpdateTask(HeuristicLab.Clients.Hive.Task taskDto);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateTaskData", ReplyAction = "http://tempuri.org/IHiveService/UpdateTaskDataResponse")]
+    void UpdateTaskData(HeuristicLab.Clients.Hive.Task taskDto, HeuristicLab.Clients.Hive.TaskData taskDataDto);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteTask", ReplyAction = "http://tempuri.org/IHiveService/DeleteTaskResponse")]
+    void DeleteTask(System.Guid taskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteChildTasks", ReplyAction = "http://tempuri.org/IHiveService/DeleteChildTasksResponse")]
+    void DeleteChildTasks(System.Guid parentTaskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateTaskState", ReplyAction = "http://tempuri.org/IHiveService/UpdateTaskStateResponse")]
+    HeuristicLab.Clients.Hive.Task UpdateTaskState(System.Guid taskId, HeuristicLab.Clients.Hive.TaskState taskState, System.Nullable<System.Guid> slaveId, System.Nullable<System.Guid> userId, string exception);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/StopTask", ReplyAction = "http://tempuri.org/IHiveService/StopTaskResponse")]
+    void StopTask(System.Guid taskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/PauseTask", ReplyAction = "http://tempuri.org/IHiveService/PauseTaskResponse")]
+    void PauseTask(System.Guid taskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/RestartTask", ReplyAction = "http://tempuri.org/IHiveService/RestartTaskResponse")]
+    void RestartTask(System.Guid taskId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJob", ReplyAction = "http://tempuri.org/IHiveService/GetJobResponse")]
+    HeuristicLab.Clients.Hive.Job GetJob(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJobs", ReplyAction = "http://tempuri.org/IHiveService/GetJobsResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobs();
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetAllJobs", ReplyAction = "http://tempuri.org/IHiveService/GetAllJobsResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetAllJobs();
+
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddJob", ReplyAction = "http://tempuri.org/IHiveService/AddJobResponse")]
-    System.Guid AddJob(HeuristicLab.Clients.Hive.Task job, HeuristicLab.Clients.Hive.TaskData jobData, System.Collections.Generic.List<System.Guid> resourceIds);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddChildJob", ReplyAction = "http://tempuri.org/IHiveService/AddChildJobResponse")]
-    System.Guid AddChildJob(System.Guid parentJobId, HeuristicLab.Clients.Hive.Task job, HeuristicLab.Clients.Hive.TaskData jobData);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJob", ReplyAction = "http://tempuri.org/IHiveService/GetJobResponse")]
-    HeuristicLab.Clients.Hive.Task GetJob(System.Guid jobId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJobs", ReplyAction = "http://tempuri.org/IHiveService/GetJobsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetJobs();
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetLightweightJobs", ReplyAction = "http://tempuri.org/IHiveService/GetLightweightJobsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightJobs(System.Collections.Generic.List<System.Guid> jobIds);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetLightweightChildJobs", ReplyAction = "http://tempuri.org/IHiveService/GetLightweightChildJobsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightChildJobs(System.Nullable<System.Guid> parentJobId, bool recursive, bool includeParent);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetLightweightExperimentJobs", ReplyAction = "http://tempuri.org/IHiveService/GetLightweightExperimentJobsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightExperimentJobs(System.Guid experimentId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJobData", ReplyAction = "http://tempuri.org/IHiveService/GetJobDataResponse")]
-    HeuristicLab.Clients.Hive.TaskData GetJobData(System.Guid jobId);
+    System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateJob", ReplyAction = "http://tempuri.org/IHiveService/UpdateJobResponse")]
-    void UpdateJob(HeuristicLab.Clients.Hive.Task jobDto);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateJobData", ReplyAction = "http://tempuri.org/IHiveService/UpdateJobDataResponse")]
-    void UpdateJobData(HeuristicLab.Clients.Hive.Task jobDto, HeuristicLab.Clients.Hive.TaskData jobDataDto);
+    void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteJob", ReplyAction = "http://tempuri.org/IHiveService/DeleteJobResponse")]
-    void DeleteJob(System.Guid jobId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteChildJobs", ReplyAction = "http://tempuri.org/IHiveService/DeleteChildJobsResponse")]
-    void DeleteChildJobs(System.Guid parentJobId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateJobState", ReplyAction = "http://tempuri.org/IHiveService/UpdateJobStateResponse")]
-    HeuristicLab.Clients.Hive.Task UpdateJobState(System.Guid jobId, HeuristicLab.Clients.Hive.TaskState jobState, System.Nullable<System.Guid> slaveId, System.Nullable<System.Guid> userId, string exception);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/StopJob", ReplyAction = "http://tempuri.org/IHiveService/StopJobResponse")]
-    void StopJob(System.Guid jobId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/PauseJob", ReplyAction = "http://tempuri.org/IHiveService/PauseJobResponse")]
-    void PauseJob(System.Guid jobId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/RestartJob", ReplyAction = "http://tempuri.org/IHiveService/RestartJobResponse")]
-    void RestartJob(System.Guid jobId);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/GetHiveExperimentResponse")]
-    HeuristicLab.Clients.Hive.Job GetHiveExperiment(System.Guid id);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetHiveExperiments", ReplyAction = "http://tempuri.org/IHiveService/GetHiveExperimentsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetHiveExperiments();
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetAllHiveExperiments", ReplyAction = "http://tempuri.org/IHiveService/GetAllHiveExperimentsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetAllHiveExperiments();
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/AddHiveExperimentResponse")]
-    System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/UpdateHiveExperimentResponse")]
-    void UpdateHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto);
-
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/DeleteHiveExperimentResponse")]
-    void DeleteHiveExperiment(System.Guid hiveExperimentId);
+    void DeleteJob(System.Guid JobId);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GrantPermission", ReplyAction = "http://tempuri.org/IHiveService/GrantPermissionResponse")]
-    void GrantPermission(System.Guid hiveExperimentId, System.Guid grantedUserId, HeuristicLab.Clients.Hive.Permission permission);
+    void GrantPermission(System.Guid jobId, System.Guid grantedUserId, HeuristicLab.Clients.Hive.Permission permission);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/RevokePermission", ReplyAction = "http://tempuri.org/IHiveService/RevokePermissionResponse")]
     void RevokePermission(System.Guid hiveExperimentId, System.Guid grantedUserId);
 
-    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetHiveExperimentPermissions", ReplyAction = "http://tempuri.org/IHiveService/GetHiveExperimentPermissionsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetHiveExperimentPermissions(System.Guid hiveExperimentId);
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetJobPermissions", ReplyAction = "http://tempuri.org/IHiveService/GetJobPermissionsResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetJobPermissions(System.Guid jobId);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/IsAllowedPrivileged", ReplyAction = "http://tempuri.org/IHiveService/IsAllowedPrivilegedResponse")]
@@ -1780 +1778 @@
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetJobsByResourceId(System.Guid resourceId) {
-      return base.Channel.GetJobsByResourceId(resourceId);
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetTasksByResourceId(System.Guid resourceId) {
+      return base.Channel.GetTasksByResourceId(resourceId);
     }
 
@@ -1812 +1810 @@
     }
 
-    public System.Guid AddJob(HeuristicLab.Clients.Hive.Task job, HeuristicLab.Clients.Hive.TaskData jobData, System.Collections.Generic.List<System.Guid> resourceIds) {
-      return base.Channel.AddJob(job, jobData, resourceIds);
-    }
-
-    public System.Guid AddChildJob(System.Guid parentJobId, HeuristicLab.Clients.Hive.Task job, HeuristicLab.Clients.Hive.TaskData jobData) {
-      return base.Channel.AddChildJob(parentJobId, job, jobData);
-    }
-
-    public HeuristicLab.Clients.Hive.Task GetJob(System.Guid jobId) {
-      return base.Channel.GetJob(jobId);
-    }
-
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetJobs() {
+    public System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData, System.Collections.Generic.List<System.Guid> resourceIds) {
+      return base.Channel.AddTask(task, taskData, resourceIds);
+    }
+
+    public System.Guid AddChildTask(System.Guid parentTaskId, HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData) {
+      return base.Channel.AddChildTask(parentTaskId, task, taskData);
+    }
+
+    public HeuristicLab.Clients.Hive.Task GetTask(System.Guid taskId) {
+      return base.Channel.GetTask(taskId);
+    }
+
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Task> GetTasks() {
+      return base.Channel.GetTasks();
+    }
+
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightTasks(System.Collections.Generic.List<System.Guid> taskIds) {
+      return base.Channel.GetLightweightTasks(taskIds);
+    }
+
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightChildTasks(System.Nullable<System.Guid> parentTaskId, bool recursive, bool includeParent) {
+      return base.Channel.GetLightweightChildTasks(parentTaskId, recursive, includeParent);
+    }
+
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightJobTasks(System.Guid jobId) {
+      return base.Channel.GetLightweightJobTasks(jobId);
+    }
+
+    public HeuristicLab.Clients.Hive.TaskData GetTaskData(System.Guid taskId) {
+      return base.Channel.GetTaskData(taskId);
+    }
+
+    public void UpdateTask(HeuristicLab.Clients.Hive.Task taskDto) {
+      base.Channel.UpdateTask(taskDto);
+    }
+
+    public void UpdateTaskData(HeuristicLab.Clients.Hive.Task taskDto, HeuristicLab.Clients.Hive.TaskData taskDataDto) {
+      base.Channel.UpdateTaskData(taskDto, taskDataDto);
+    }
+
+    public void DeleteTask(System.Guid taskId) {
+      base.Channel.DeleteTask(taskId);
+    }
+
+    public void DeleteChildTasks(System.Guid parentTaskId) {
+      base.Channel.DeleteChildTasks(parentTaskId);
+    }
+
+    public HeuristicLab.Clients.Hive.Task UpdateTaskState(System.Guid taskId, HeuristicLab.Clients.Hive.TaskState taskState, System.Nullable<System.Guid> slaveId, System.Nullable<System.Guid> userId, string exception) {
+      return base.Channel.UpdateTaskState(taskId, taskState, slaveId, userId, exception);
+    }
+
+    public void StopTask(System.Guid taskId) {
+      base.Channel.StopTask(taskId);
+    }
+
+    public void PauseTask(System.Guid taskId) {
+      base.Channel.PauseTask(taskId);
+    }
+
+    public void RestartTask(System.Guid taskId) {
+      base.Channel.RestartTask(taskId);
+    }
+
+    public HeuristicLab.Clients.Hive.Job GetJob(System.Guid id) {
+      return base.Channel.GetJob(id);
+    }
+
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobs() {
       return base.Channel.GetJobs();
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightJobs(System.Collections.Generic.List<System.Guid> jobIds) {
-      return base.Channel.GetLightweightJobs(jobIds);
-    }
-
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightChildJobs(System.Nullable<System.Guid> parentJobId, bool recursive, bool includeParent) {
-      return base.Channel.GetLightweightChildJobs(parentJobId, recursive, includeParent);
-    }
-
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.LightweightTask> GetLightweightExperimentJobs(System.Guid experimentId) {
-      return base.Channel.GetLightweightExperimentJobs(experimentId);
-    }
-
-    public HeuristicLab.Clients.Hive.TaskData GetJobData(System.Guid jobId) {
-      return base.Channel.GetJobData(jobId);
-    }
-
-    public void UpdateJob(HeuristicLab.Clients.Hive.Task jobDto) {
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetAllJobs() {
+      return base.Channel.GetAllJobs();
+    }
+
+    public System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto) {
+      return base.Channel.AddJob(jobDto);
+    }
+
+    public void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto) {
       base.Channel.UpdateJob(jobDto);
     }
 
-    public void UpdateJobData(HeuristicLab.Clients.Hive.Task jobDto, HeuristicLab.Clients.Hive.TaskData jobDataDto) {
-      base.Channel.UpdateJobData(jobDto, jobDataDto);
-    }
-
-    public void DeleteJob(System.Guid jobId) {
-      base.Channel.DeleteJob(jobId);
-    }
-
-    public void DeleteChildJobs(System.Guid parentJobId) {
-      base.Channel.DeleteChildJobs(parentJobId);
-    }
-
-    public HeuristicLab.Clients.Hive.Task UpdateJobState(System.Guid jobId, HeuristicLab.Clients.Hive.TaskState jobState, System.Nullable<System.Guid> slaveId, System.Nullable<System.Guid> userId, string exception) {
-      return base.Channel.UpdateJobState(jobId, jobState, slaveId, userId, exception);
-    }
-
-    public void StopJob(System.Guid jobId) {
-      base.Channel.StopJob(jobId);
-    }
-
-    public void PauseJob(System.Guid jobId) {
-      base.Channel.PauseJob(jobId);
-    }
-
-    public void RestartJob(System.Guid jobId) {
-      base.Channel.RestartJob(jobId);
-    }
-
-    public HeuristicLab.Clients.Hive.Job GetHiveExperiment(System.Guid id) {
-      return base.Channel.GetHiveExperiment(id);
-    }
-
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetHiveExperiments() {
-      return base.Channel.GetHiveExperiments();
-    }
-
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetAllHiveExperiments() {
-      return base.Channel.GetAllHiveExperiments();
-    }
-
-    public System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto) {
-      return base.Channel.AddHiveExperiment(hiveExperimentDto);
-    }
-
-    public void UpdateHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto) {
-      base.Channel.UpdateHiveExperiment(hiveExperimentDto);
-    }
-
-    public void DeleteHiveExperiment(System.Guid hiveExperimentId) {
-      base.Channel.DeleteHiveExperiment(hiveExperimentId);
-    }
-
-    public void GrantPermission(System.Guid hiveExperimentId, System.Guid grantedUserId, HeuristicLab.Clients.Hive.Permission permission) {
-      base.Channel.GrantPermission(hiveExperimentId, grantedUserId, permission);
+    public void DeleteJob(System.Guid JobId) {
+      base.Channel.DeleteJob(JobId);
+    }
+
+    public void GrantPermission(System.Guid jobId, System.Guid grantedUserId, HeuristicLab.Clients.Hive.Permission permission) {
+      base.Channel.GrantPermission(jobId, grantedUserId, permission);
     }
 
@@ -1908 +1906 @@
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetHiveExperimentPermissions(System.Guid hiveExperimentId) {
-      return base.Channel.GetHiveExperimentPermissions(hiveExperimentId);
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetJobPermissions(System.Guid jobId) {
+      return base.Channel.GetJobPermissions(jobId);
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/LightweightTask.cs

@@ -42 +42 @@
       this.State = job.State;
       this.Command = job.Command;
-      this.LastJobDataUpdate = job.LastJobDataUpdate;
+      this.LastTaskDataUpdate = job.LastTaskDataUpdate;
     }
 
@@ -52 +52 @@
       this.State = original.State;
       this.Command = original.Command;
-      this.LastJobDataUpdate = original.LastJobDataUpdate;
+      this.LastTaskDataUpdate = original.LastTaskDataUpdate;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

@@ -72 +72 @@
     
     public void StartAsync() {
-      foreach (Guid jobId in taskIds) {
-        Task job = ServiceLocator.Instance.CallHiveService(s => s.GetJob(jobId));
+      foreach (Guid taskId in taskIds) {
+        Task task = ServiceLocator.Instance.CallHiveService(s => s.GetTask(taskId));
 
-        taskDownloader.DownloadJob(job,
+        taskDownloader.DownloadTask(task,
           (localJob, itemJob) => {
             if (localJob != null && itemJob != null) {
-              HiveTask hiveJob;
+              HiveTask hiveTask;
               if (itemJob is OptimizerTask) {
-                hiveJob = new OptimizerHiveTask((OptimizerTask)itemJob);
+                hiveTask = new OptimizerHiveTask((OptimizerTask)itemJob);
               } else {
-                hiveJob = new HiveTask(itemJob, true);
+                hiveTask = new HiveTask(itemJob, true);
               }
-              hiveJob.Task = localJob;
-              this.results.Add(localJob.Id, hiveJob);
+              hiveTask.Task = localJob;
+              this.results.Add(localJob.Id, hiveTask);
             }
           });