Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3

Timestamp:

12/20/11 13:54:57 (12 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (8 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (19 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs (modified) (15 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs (modified) (12 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs)
• HeuristicLab.Clients.Hive/3.3/IHiveServiceLocator.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive/3.3/IHiveServiceLocator.cs)
• HeuristicLab.Clients.Hive/3.3/IServiceLocator.cs (deleted)
• HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/ExecutorMessageContainer.cs (deleted)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs (deleted)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/JobPermission.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/TaskData.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/TaskData.cs)
• HeuristicLab.Clients.Hive/3.3/ServiceLocator.cs (deleted)
• HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Settings.settings (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/app.config (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/app.config.DebugLocal (deleted)
• HeuristicLab.Clients.Hive/3.3/app.config.DebugServices (deleted)

branches/HeuristicLab.Hive.Azure

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3

@@ -1 +1 @@
 obj
 Plugin.cs
+bin

@@ -1 +1 @@
 obj
 Plugin.cs
+bin

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs

@@ -42 +42 @@
     }
 
-    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);
+    public void DownloadTaskData(Task t, Action<Task, T> onFinishedAction) {
+      Task<Tuple<Task, T>> task = Task<Tuple<Task, TaskData>>.Factory.StartNew(DownloadTaskData, t)
+                                     .ContinueWith((y) => DeserializeTask(y.Result));
+
+      task.ContinueWith((x) => OnTaskFinished(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
+      task.ContinueWith((x) => OnTaskFailed(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
 
-    private void OnTaskFinished(Task job, Task<T> task, Action<Task, T> onFinishedAction) {
-      onFinishedAction(job, task.Result);
+    public void DownloadTaskDataAndTask(Guid taskId, Action<Task, T> onFinishedAction) {
+      Task<Tuple<Task, T>> task = Task<Task>.Factory.StartNew(DownloadTask, taskId)
+                                     .ContinueWith((x) => DownloadTaskData(x.Result))
+                                     .ContinueWith((y) => DeserializeTask(y.Result));
+
+      task.ContinueWith((x) => OnTaskFinished(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
+      task.ContinueWith((x) => OnTaskFailed(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
-    private void OnTaskFailed(Task job, Task<T> task, Action<Task, T> onFinishedAction) {
+
+    private void OnTaskFinished(Task<Tuple<Task, T>> task, Action<Task, T> onFinishedAction) {
+      onFinishedAction(task.Result.Item1, task.Result.Item2);
+    }
+    private void OnTaskFailed(Task<Tuple<Task, T>> task, Action<Task, T> onFinishedAction) {
       task.Exception.Flatten().Handle((e) => { return true; });
       OnExceptionOccured(task.Exception.Flatten());
-      onFinishedAction(job, null);
+      onFinishedAction(task.Result.Item1, null);
     }
 
-    protected TaskData DownloadTask(object taskId) {
+    private Task DownloadTask(object taskId) {
+      return HiveServiceLocator.Instance.CallHiveService(s => s.GetTask((Guid)taskId));
+    }
+
+    protected Tuple<Task, TaskData> DownloadTaskData(object taskId) {
+      return DownloadTaskData((Task)taskId);
+    }
+
+    protected Tuple<Task, TaskData> DownloadTaskData(Task task) {
       downloadSemaphore.WaitOne();
-      deserializeSemaphore.WaitOne();
       TaskData result;
       try {
         if (abort) return null;
-        result = ServiceLocator.Instance.CallHiveService(s => s.GetTaskData((Guid)taskId));
-      }
-      finally {
+        result = HiveServiceLocator.Instance.CallHiveService(s => s.GetTaskData(task.Id));
+      } finally {
         downloadSemaphore.Release();
       }
-      return result;
+      return new Tuple<Task, TaskData>(task, result);
     }
 
-    protected T DeserializeTask(TaskData taskData) {
+    protected Tuple<Task, T> DeserializeTask(Tuple<Task, TaskData> taskData) {
+      deserializeSemaphore.WaitOne();
       try {
-        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;
-      }
-      finally {
+        if (abort || taskData.Item2 == null || taskData.Item1 == null) return null;
+        var deserializedJob = PersistenceUtil.Deserialize<T>(taskData.Item2.Data);
+        taskData.Item2.Data = null; // reduce memory consumption.
+        return new Tuple<Task, T>(taskData.Item1, deserializedJob);
+      } finally {
         deserializeSemaphore.Release();
       }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -40 +40 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -55 +55 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -69 +69 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Clients.Hive-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Clients.Hive-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>
@@ -98 +128 @@
     <Compile Include="StateLogList.cs" />
     <Compile Include="StateLogListList.cs" />
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Plugin.cs.frame" />
     <Compile Include="Exceptions\AddTaskToHiveException.cs" />
@@ -114 +146 @@
     </Compile>
     <Compile Include="Exceptions\ResourceNotFoundException.cs" />
-    <Compile Include="IServiceLocator.cs" />
+    <Compile Include="IHiveServiceLocator.cs" />
     <Compile Include="Tasks\EngineTask.cs" />
     <Compile Include="Tasks\OptimizerTask.cs" />
@@ -135 +167 @@
     <Compile Include="ServiceClients\Heartbeat.cs" />
     <Compile Include="ServiceClients\HiveItem.cs" />
-    <Compile Include="ServiceClients\JobData.cs" />
+    <Compile Include="ServiceClients\TaskData.cs" />
     <Compile Include="ServiceClients\Plugin.cs" />
     <Compile Include="ServiceClients\PluginData.cs" />
@@ -144 +176 @@
     <Compile Include="ServiceClients\Slave.cs" />
     <Compile Include="ServiceClients\LightweightTask.cs" />
-    <Compile Include="ServiceClients\ExecutorMessageContainer.cs" />
     <Compile Include="ServiceClients\MessageContainer.cs" />
     <Compile Include="ServiceClients\HiveServiceClient.cs" />
     <Compile Include="ServiceClients\Task.cs" />
-    <Compile Include="ServiceLocator.cs" />
+    <Compile Include="HiveServiceLocator.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="ServiceClients\GenerateServiceClients.cmd" />
@@ -185 +216 @@
       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
       <Name>HeuristicLab.Data-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj">

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

@@ -79 +79 @@
         resources = new ItemList<Resource>();
 
-        ServiceLocator.Instance.CallHiveService(service => {
+        HiveServiceLocator.Instance.CallHiveService(service => {
           service.GetSlaveGroups().ForEach(g => resources.Add(g));
           service.GetSlaves().ForEach(s => resources.Add(s));
@@ -101 +101 @@
           downtimes = new ItemList<Downtime>();
 
-          ServiceLocator.Instance.CallHiveService(service => {
+          HiveServiceLocator.Instance.CallHiveService(service => {
             service.GetDowntimesForResource(downtimeForResourceId).ForEach(d => downtimes.Add(d));
           });
@@ -119 +119 @@
       if (item.Id == Guid.Empty) {
         if (item is SlaveGroup) {
-          item.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddSlaveGroup((SlaveGroup)item));
+          item.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddSlaveGroup((SlaveGroup)item));
         }
         if (item is Slave) {
-          item.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddSlave((Slave)item));
+          item.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddSlave((Slave)item));
         }
         if (item is Downtime) {
-          item.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddDowntime((Downtime)item));
+          item.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddDowntime((Downtime)item));
         }
       } else {
         if (item is SlaveGroup) {
-          ServiceLocator.Instance.CallHiveService((s) => s.UpdateSlaveGroup((SlaveGroup)item));
+          HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateSlaveGroup((SlaveGroup)item));
         }
         if (item is Slave) {
-          ServiceLocator.Instance.CallHiveService((s) => s.UpdateSlave((Slave)item));
+          HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateSlave((Slave)item));
         }
         if (item is Downtime) {
-          ServiceLocator.Instance.CallHiveService((s) => s.UpdateDowntime((Downtime)item));
+          HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateDowntime((Downtime)item));
         }
       }
@@ -144 +144 @@
     public static void Delete(IHiveItem item) {
       if (item is SlaveGroup) {
-        ServiceLocator.Instance.CallHiveService((s) => s.DeleteSlaveGroup(item.Id));
+        HiveServiceLocator.Instance.CallHiveService((s) => s.DeleteSlaveGroup(item.Id));
       } else if (item is Slave) {
-        ServiceLocator.Instance.CallHiveService((s) => s.DeleteSlave(item.Id));
+        HiveServiceLocator.Instance.CallHiveService((s) => s.DeleteSlave(item.Id));
       } else if (item is Downtime) {
-        ServiceLocator.Instance.CallHiveService((s) => s.DeleteDowntime(item.Id));
+        HiveServiceLocator.Instance.CallHiveService((s) => s.DeleteDowntime(item.Id));
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -82 +82 @@
 
       try {
-        this.IsAllowedPrivileged = ServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
+        this.IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
 
         var oldJobs = jobs ?? new ItemCollection<RefreshableJob>();
         jobs = new HiveItemCollection<RefreshableJob>();
-        var jobsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
+        var jobsLoaded = HiveServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
 
         foreach (var j in jobsLoaded) {
@@ -113 +113 @@
         jobs = null;
         throw;
-      }
-      finally {
+      } finally {
         OnRefreshed();
       }
@@ -143 +142 @@
         if (item is JobPermission) {
           var hep = (JobPermission)item;
-          hep.GrantedUserId = ServiceLocator.Instance.CallHiveService((s) => s.GetUserIdByUsername(hep.GrantedUserName));
+          hep.GrantedUserId = HiveServiceLocator.Instance.CallHiveService((s) => s.GetUserIdByUsername(hep.GrantedUserName));
           if (hep.GrantedUserId == Guid.Empty) {
             throw new ArgumentException(string.Format("The user {0} was not found.", hep.GrantedUserName));
           }
-          ServiceLocator.Instance.CallHiveService((s) => s.GrantPermission(hep.JobId, hep.GrantedUserId, hep.Permission));
+          HiveServiceLocator.Instance.CallHiveService((s) => s.GrantPermission(hep.JobId, hep.GrantedUserId, hep.Permission));
         }
       } else {
         if (item is Job)
-          ServiceLocator.Instance.CallHiveService(s => s.UpdateJob((Job)item));
+          HiveServiceLocator.Instance.CallHiveService(s => s.UpdateJob((Job)item));
       }
     }
@@ -173 +172 @@
     #region Delete
     public static void Delete(IHiveItem item) {
-      if (item.Id == Guid.Empty)
+      if (item.Id == Guid.Empty && item.GetType() != typeof(JobPermission))
         return;
 
       if (item is Job)
-        ServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
-      if (item is RefreshableJob)
-        ServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
+      if (item is RefreshableJob) {
+        RefreshableJob job = (RefreshableJob)item;
+        if (job.RefreshAutomatically) {
+          job.StopResultPolling();
+        }
+        HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
+      }
       if (item is JobPermission) {
         var hep = (JobPermission)item;
-        ServiceLocator.Instance.CallHiveService(s => s.RevokePermission(hep.JobId, hep.GrantedUserId));
+        HiveServiceLocator.Instance.CallHiveService(s => s.RevokePermission(hep.JobId, hep.GrantedUserId));
       }
       item.Id = Guid.Empty;
@@ -216 +220 @@
 
     public static void PauseJob(RefreshableJob refreshableJob) {
-      ServiceLocator.Instance.CallHiveService(service => {
+      HiveServiceLocator.Instance.CallHiveService(service => {
         foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
           if (task.Task.State != TaskState.Finished && task.Task.State != TaskState.Aborted && task.Task.State != TaskState.Failed)
@@ -226 +230 @@
 
     public static void StopJob(RefreshableJob refreshableJob) {
-      ServiceLocator.Instance.CallHiveService(service => {
+      HiveServiceLocator.Instance.CallHiveService(service => {
         foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
           if (task.Task.State != TaskState.Finished && task.Task.State != TaskState.Aborted && task.Task.State != TaskState.Failed)
@@ -232 +236 @@
         }
       });
-      // execution state does not need to be set. it will be set to Stopped, when all jobs have been downloaded
+      refreshableJob.ExecutionState = ExecutionState.Stopped;
+    }
+
+    public static void ResumeJob(RefreshableJob refreshableJob) {
+      HiveServiceLocator.Instance.CallHiveService(service => {
+        foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
+          if (task.Task.State == TaskState.Paused) {
+            service.RestartTask(task.Task.Id);
+          }
+        }
+      });
+      refreshableJob.ExecutionState = ExecutionState.Started;
     }
 
@@ -247 +262 @@
         var resourceIds = new List<Guid>();
         foreach (var resourceName in resourceNames) {
-          Guid resourceId = ServiceLocator.Instance.CallHiveService((s) => s.GetResourceId(resourceName));
+          Guid resourceId = HiveServiceLocator.Instance.CallHiveService((s) => s.GetResourceId(resourceName));
           if (resourceId == Guid.Empty) {
             throw new ResourceNotFoundException(string.Format("Could not find the resource '{0}'", resourceName));
@@ -260 +275 @@
         // upload Job
         refreshableJob.Progress.Status = "Uploading Job...";
-        refreshableJob.Job.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job));
+        refreshableJob.Job.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job));
         bool isPrivileged = refreshableJob.Job.IsPrivileged;
-        refreshableJob.Job = ServiceLocator.Instance.CallHiveService((s) => s.GetJob(refreshableJob.Job.Id)); // update owner and permissions
+        refreshableJob.Job = HiveServiceLocator.Instance.CallHiveService((s) => s.GetJob(refreshableJob.Job.Id)); // update owner and permissions
         refreshableJob.Job.IsPrivileged = isPrivileged;
         cancellationToken.ThrowIfCancellationRequested();
@@ -272 +287 @@
         // upload plugins
         refreshableJob.Progress.Status = "Uploading plugins...";
-        this.OnlinePlugins = ServiceLocator.Instance.CallHiveService((s) => s.GetPlugins());
+        this.OnlinePlugins = HiveServiceLocator.Instance.CallHiveService((s) => s.GetPlugins());
         this.AlreadyUploadedPlugins = new List<Plugin>();
-        Plugin configFilePlugin = ServiceLocator.Instance.CallHiveService((s) => UploadConfigurationFile(s, onlinePlugins));
+        Plugin configFilePlugin = HiveServiceLocator.Instance.CallHiveService((s) => UploadConfigurationFile(s, onlinePlugins));
         this.alreadyUploadedPlugins.Add(configFilePlugin);
         cancellationToken.ThrowIfCancellationRequested();
@@ -297 +312 @@
         }
         refreshableJob.Job.Modified = false;
-      }
-      finally {
+      } finally {
         refreshableJob.IsProgressing = false;
       }
@@ -359 +373 @@
           if (!cancellationToken.IsCancellationRequested) {
             lock (pluginLocker) {
-              ServiceLocator.Instance.CallHiveService((s) => hiveTask.Task.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+              HiveServiceLocator.Instance.CallHiveService((s) => hiveTask.Task.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
             }
           }
-        }, -1, "Failed to upload plugins");
+        }, Settings.Default.MaxRepeatServiceCalls, "Failed to upload plugins");
         cancellationToken.ThrowIfCancellationRequested();
         hiveTask.Task.PluginsNeededIds.Add(configPluginId);
@@ -372 +386 @@
           if (!cancellationToken.IsCancellationRequested) {
             if (parentHiveTask != null) {
-              hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveTask.Task.Id, hiveTask.Task, taskData));
+              hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveTask.Task.Id, hiveTask.Task, taskData));
             } else {
-              hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData, groups.ToList()));
+              hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData, groups.ToList()));
             }
           }
-        }, 50, "Failed to add task", log);
+        }, Settings.Default.MaxRepeatServiceCalls, "Failed to add task", log);
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -400 +414 @@
           if (!ae.InnerExceptions.All(e => e is TaskCanceledException)) throw ae; // for some reason the WaitAll throws a AggregateException containg a TaskCanceledException. i don't know where it comes from, however the tasks all finish properly, so for now just ignore it
         }
-      }
-      finally {
+      } finally {
         if (!semaphoreReleased) taskUploadSemaphore.Release();
       }
@@ -420 +433 @@
         // fetch all task objects to create the full tree of tree of HiveTask objects
         refreshableJob.Progress.Status = "Downloading list of tasks...";
-        allTasks = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasks(hiveExperiment.Id));
+        allTasks = HiveServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasks(hiveExperiment.Id));
         totalJobCount = allTasks.Count();
 
+        refreshableJob.Progress.Status = "Downloading tasks...";
         TaskDownloader downloader = new TaskDownloader(allTasks.Select(x => x.Id));
         downloader.StartAsync();
@@ -436 +450 @@
         }
         IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results;
-
-        refreshableJob.HiveTasks = new ItemCollection<HiveTask>(allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue));
-
+        var parents = allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue);
+
+        refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";
+        // build child-task tree
+        foreach (HiveTask hiveTask in parents) {
+          BuildHiveJobTree(hiveTask, allTasks, allHiveTasks);
+        }
+
+        refreshableJob.HiveTasks = new ItemCollection<HiveTask>(parents);
         if (refreshableJob.IsFinished()) {
           refreshableJob.ExecutionState = Core.ExecutionState.Stopped;
@@ -444 +464 @@
           refreshableJob.ExecutionState = Core.ExecutionState.Started;
         }
-
-        // build child-task tree
-        foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
-          BuildHiveJobTree(hiveTask, allTasks, allHiveTasks);
-        }
-
         refreshableJob.OnLoaded();
-      }
-      finally {
+      } finally {
         refreshableJob.IsProgressing = false;
       }
     }
 
-    private static void BuildHiveJobTree(HiveTask parentHiveJob, IEnumerable<LightweightTask> allJobs, IDictionary<Guid, HiveTask> allHiveJobs) {
-      IEnumerable<LightweightTask> childTasks = from job in allJobs
-                                                where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveJob.Task.Id
+    private static void BuildHiveJobTree(HiveTask parentHiveTask, IEnumerable<LightweightTask> allTasks, IDictionary<Guid, HiveTask> allHiveTasks) {
+      IEnumerable<LightweightTask> childTasks = from job in allTasks
+                                                where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveTask.Task.Id
                                                 orderby job.DateCreated ascending
                                                 select job;
       foreach (LightweightTask task in childTasks) {
-        HiveTask childHiveTask = allHiveJobs[task.Id];
-        parentHiveJob.AddChildHiveJob(childHiveTask);
-        BuildHiveJobTree(childHiveTask, allJobs, allHiveJobs);
+        HiveTask childHiveTask = allHiveTasks[task.Id];
+        parentHiveTask.AddChildHiveTask(childHiveTask);
+        BuildHiveJobTree(childHiveTask, allTasks, allHiveTasks);
       }
     }
@@ -482 +495 @@
 
     public static ItemTask LoadItemJob(Guid jobId) {
-      TaskData taskData = ServiceLocator.Instance.CallHiveService(s => s.GetTaskData(jobId));
+      TaskData taskData = HiveServiceLocator.Instance.CallHiveService(s => s.GetTaskData(jobId));
       try {
         return PersistenceUtil.Deserialize<ItemTask>(taskData.Data);
@@ -507 +520 @@
 
     public static HiveItemCollection<JobPermission> GetJobPermissions(Guid jobId) {
-      return ServiceLocator.Instance.CallHiveService((service) => {
+      return HiveServiceLocator.Instance.CallHiveService((service) => {
         IEnumerable<JobPermission> jps = service.GetJobPermissions(jobId);
         foreach (var hep in jps) {
-          hep.GrantedUserName = service.GetUsernameByUserId(hep.GrantedUserId);
+          hep.UnmodifiedGrantedUserNameUpdate(service.GetUsernameByUserId(hep.GrantedUserId));
         }
         return new HiveItemCollection<JobPermission>(jps);

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -55 +54 @@
       IEnumerable<Type> usedTypes;
 
-      // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems
-      //lock (locker) {
-        ((IAtomicOperation)ItemTask.InitialOperation).Scope.Parent = parentScopeClone;
-        ItemTask.InitialOperation = (IOperation)ItemTask.InitialOperation.Clone();
-        ((IAtomicOperation)ItemTask.InitialOperation).Scope.ClearParentScopes();
-        jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes);
-      //}
-
-      // add type objects from object graph to work around ticket #1527
-      var typeObjects = ItemTask.GetObjectGraphObjects().OfType<Type>();
-      usedTypes = new List<Type>(usedTypes).Union(typeObjects);
+      // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems      
+      ((IAtomicOperation)ItemTask.InitialOperation).Scope.Parent = parentScopeClone;
+      ItemTask.InitialOperation = (IOperation)ItemTask.InitialOperation.Clone();
+      ((IAtomicOperation)ItemTask.InitialOperation).Scope.ClearParentScopes();
+      jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes);
 
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-      
       return jobData;
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

@@ -71 +71 @@
           OnItemImageChanged();
         }
-
       }
     }
@@ -121 +120 @@
               hiveJob.IsControllable = value;
             }
-          }
-          finally {
+          } finally {
             childHiveTasksLock.ExitReadLock();
           }
@@ -136 +134 @@
         try {
           return childHiveTasks.AsReadOnly();
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       }
     }
@@ -145 +142 @@
 
     public StateLogList StateLog {
-      get { return new StateLogList(this.task.StateLog); }
+      get {
+        var list = new StateLogList(this.task.StateLog);
+        list.ForEach(s => { s.TaskName = itemTask.Name; });
+        return list;
+      }
     }
 
@@ -153 +154 @@
 
     #region Constructors and Cloning
+    [StorableConstructor]
+    protected HiveTask(bool deserializing) { }
+
     public HiveTask() {
-      this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 0 };
+      this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 128 };
       task.State = TaskState.Offline;
       this.childHiveTasks = new ItemList<HiveTask>();
@@ -189 +193 @@
       try {
         this.childHiveTasks = cloner.Clone(original.childHiveTasks);
-      }
-      finally { original.childHiveTasksLock.ExitReadLock(); }
+      } finally { original.childHiveTasksLock.ExitReadLock(); }
       this.syncTasksWithOptimizers = original.syncTasksWithOptimizers;
       this.isFinishedTaskDownloaded = original.isFinishedTaskDownloaded;
@@ -235 +238 @@
     }
 
-    public virtual void AddChildHiveJob(HiveTask hiveJob) {
+    public virtual void AddChildHiveTask(HiveTask hiveTask) {
       childHiveTasksLock.EnterWriteLock();
       try {
-        this.childHiveTasks.Add(hiveJob);
-      }
-      finally { childHiveTasksLock.ExitWriteLock(); }
+        this.childHiveTasks.Add(hiveTask);
+      } finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -337 +339 @@
         IsFinishedTaskDownloaded = false;
       }
+      if (e.PropertyName == "Priority" && Task != null) {
+        foreach (var task in childHiveTasks) {
+          task.Task.Priority = Task.Priority;
+        }
+      }
     }
     #endregion
@@ -352 +359 @@
         }
         return jobs;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -367 +373 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitWriteLock(); }
+      } finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -385 +390 @@
               return result;
           }
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       }
       return null;
@@ -401 +405 @@
           child.RemoveByTaskId(jobId);
         }
-      }
-      finally { childHiveTasksLock.ExitWriteLock(); }
+      } finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -453 +456 @@
         try {
           foreach (var child in childHiveTasks) {
-            ServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
+            HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
           }
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       } else {
-        ServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
       }
     }
@@ -467 +469 @@
         try {
           foreach (var child in childHiveTasks) {
-            ServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
+            HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
           }
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       } else {
-        ServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
       }
     }
 
     public void Restart() {
-      ServiceLocator.Instance.CallHiveService(service => {
+      HiveServiceLocator.Instance.CallHiveService(service => {
         TaskData taskData = new TaskData();
         taskData.TaskId = this.task.Id;
@@ -515 +516 @@
     #region Constructors and Cloning
     public HiveTask() : base() { }
+    [StorableConstructor]
+    protected HiveTask(bool deserializing) { }
     public HiveTask(T itemJob) : base(itemJob, true) { }
-    protected HiveTask(HiveTask original, Cloner cloner)
+    protected HiveTask(HiveTask<T> original, Cloner cloner)
       : base(original, cloner) {
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs

@@ -65 +65 @@
             Optimization.Experiment experiment = (Optimization.Experiment)ItemTask.Item;
             foreach (IOptimizer childOpt in experiment.Optimizers) {
-              this.childHiveTasks.Add(new OptimizerHiveTask(childOpt));
+              var optimizerHiveTask = new OptimizerHiveTask(childOpt);
+              optimizerHiveTask.Task.Priority = Task.Priority; //inherit priority from parent
+              this.childHiveTasks.Add(optimizerHiveTask);
             }
           } else if (ItemTask.Item is Optimization.BatchRun) {
@@ -71 +73 @@
             if (batchRun.Optimizer != null) {
               while (this.childHiveTasks.Count < batchRun.Repetitions) {
-                this.childHiveTasks.Add(new OptimizerHiveTask(batchRun.Optimizer));
+                var optimizerHiveTask = new OptimizerHiveTask(batchRun.Optimizer);
+                optimizerHiveTask.Task.Priority = Task.Priority;
+                this.childHiveTasks.Add(optimizerHiveTask);
               }
               while (this.childHiveTasks.Count > batchRun.Repetitions) {
@@ -136 +140 @@
             }
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -152 +155 @@
             }
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -163 +165 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -174 +175 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -205 +205 @@
           child.syncTasksWithOptimizers = true;
         }
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
       syncTasksWithOptimizers = true;
     }
@@ -268 +267 @@
           child.SetIndexInParentOptimizerList(this);
         }
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
-    }
-
-    public override void AddChildHiveJob(HiveTask hiveJob) {
-      base.AddChildHiveJob(hiveJob);
-      var optimizerHiveJob = (OptimizerHiveTask)hiveJob;
+      } finally { childHiveTasksLock.ExitReadLock(); }
+    }
+
+    public override void AddChildHiveTask(HiveTask hiveTask) {
+      base.AddChildHiveTask(hiveTask);
+      var optimizerHiveJob = (OptimizerHiveTask)hiveTask;
       syncTasksWithOptimizers = false;
       if (this.ItemTask != null && optimizerHiveJob.ItemTask != null) {
@@ -339 +337 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -351 +348 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -362 +358 @@
       int idx = run.Name.IndexOf("Run ") + 4;
 
-      if (idx == -1 || runs.Count == 0)
+      if (idx == 3 || runs.Count == 0)
         return run.Name;
 
@@ -379 +375 @@
     private static int GetRunNumber(string runName) {
       int idx = runName.IndexOf("Run ") + 4;
-      if (idx == -1) {
+      if (idx == 3) {
         return 0;
       } else {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

@@ -27 +27 @@
 namespace HeuristicLab.Clients.Hive {
   public class JobResultPoller {
-    private bool stopRequested { get; set; }
+    private bool stopRequested;
     private AutoResetEvent waitHandle;
     private Thread thread;
@@ -96 +96 @@
         catch (Exception e) {
           OnExceptionOccured(e);
-        }
-        finally {
+        } finally {
           IsPolling = false;
         }
@@ -106 +105 @@
 
     public IEnumerable<LightweightTask> FetchJobResults() {
-      return ServiceLocator.Instance.CallHiveService(service => {
+      return HiveServiceLocator.Instance.CallHiveService(service => {
         var responses = new List<LightweightTask>();
         responses.AddRange(service.GetLightweightJobTasks(jobId));

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -51 +51 @@
           OnJobChanged();
           OnToStringChanged(this, EventArgs.Empty);
+          job_ItemImageChanged(this, EventArgs.Empty);
         }
       }
@@ -194 +195 @@
       this.Job = new Job();
       this.log = new ThreadSafeLog();
-      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
+      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
       this.HiveTasks = new ItemCollection<HiveTask>();
@@ -202 +203 @@
       this.Job = hiveExperiment;
       this.log = new ThreadSafeLog();
-      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
+      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
       this.HiveTasks = new ItemCollection<HiveTask>();
@@ -208 +209 @@
     protected RefreshableJob(RefreshableJob original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
-      this.Job = original.Job;
+      this.Job = cloner.Clone(original.Job);
       this.IsControllable = original.IsControllable;
       this.log = cloner.Clone(original.log);
       this.RefreshAutomatically = false; // do not start results polling automatically
-      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
+      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
       this.HiveTasks = cloner.Clone(original.HiveTasks);
@@ -230 +231 @@
     public void StartResultPolling() {
       if (jobResultPoller == null) {
-        jobResultPoller = new JobResultPoller(job.Id, /*ApplicationConstants.ResultPollingInterval*/new TimeSpan(0, 0, 5)); //TODO: find a better place for ApplicationConstants
+        jobResultPoller = new JobResultPoller(job.Id, Settings.Default.ResultPollingInterval);
         RegisterResultPollingEvents();
         jobResultPoller.AutoResumeOnException = true;
@@ -276 +277 @@
             log.LogMessage(string.Format("Downloading task {0}", lightweightTask.Id));
             hiveTask.IsDownloading = true;
-            jobDownloader.DownloadTask(hiveTask.Task, (localJob, itemJob) => {
+            jobDownloader.DownloadTaskData(hiveTask.Task, (localJob, itemJob) => {
               log.LogMessage(string.Format("Finished downloading task {0}", localJob.Id));
               HiveTask localHiveTask = GetHiveJobById(localJob.Id);
@@ -533 +534 @@
     public virtual void OnLoaded() {
       this.UpdateTotalExecutionTime();
+      this.OnStateLogListChanged();
 
       if (this.ExecutionState != ExecutionState.Stopped) {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobPermission.cs

@@ -37 +37 @@
     }
 
+    public void UnmodifiedGrantedUserNameUpdate(string userName) {
+      grantedUserName = userName;
+    }
+
     public JobPermission() {
       this.Permission = Permission.Read;

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs

@@ -31 +31 @@
     protected PluginData(PluginData original, Cloner cloner)
       : base(original, cloner) {
-      if (original.Data != null)
+      if (original.Data != null) {
         this.Data = new byte[original.Data.Length];
-      Array.Copy(original.Data, this.Data, original.Data.Length);
+        Array.Copy(original.Data, this.Data, original.Data.Length);
+      }
       this.FileName = original.FileName;
       this.PluginId = original.PluginId;

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs

@@ -38 +38 @@
     }
 
+    public string TaskName { get; set; }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new StateLog(this, cloner);

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

@@ -34 +34 @@
       this.CoresNeeded = original.CoresNeeded;
       this.MemoryNeeded = original.MemoryNeeded;
-      this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
+      if (original.PluginsNeededIds != null) {
+        this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
+      }
       this.LastHeartbeat = original.LastHeartbeat;
       this.IsParentTask = original.IsParentTask;

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.235
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -41 +41 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
+        public global::System.TimeSpan ResultPollingInterval {
+            get {
+                return ((global::System.TimeSpan)(this["ResultPollingInterval"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public int MaxParallelDownloads {
+            get {
+                return ((int)(this["MaxParallelDownloads"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("5")]
+        public int MaxRepeatServiceCalls {
+            get {
+                return ((int)(this["MaxRepeatServiceCalls"]));
+            }
+        }
     }
 }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/Settings.settings

@@ -9 +9 @@
       <Value Profile="(Default)">HeuristicLab 3.3.exe</Value>
     </Setting>
+    <Setting Name="ResultPollingInterval" Type="System.TimeSpan" Scope="Application">
+      <Value Profile="(Default)">00:00:20</Value>
+    </Setting>
+    <Setting Name="MaxParallelDownloads" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="MaxRepeatServiceCalls" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

@@ -25 +25 @@
 using HeuristicLab.Clients.Hive.Jobs;
 using HeuristicLab.Common;
+using System.Threading;
 
 namespace HeuristicLab.Clients.Hive {
@@ -33 +34 @@
     private bool exceptionOccured = false;
     private Exception currentException;
+    private ReaderWriterLockSlim resultsLock = new ReaderWriterLockSlim();
 
     public bool IsFinished {
       get {
-        return results.Count == taskIds.Count();
+          try {        
+              resultsLock.EnterReadLock();
+              return results.Count == taskIds.Count();
+          } finally { resultsLock.ExitReadLock(); }
       }
     }
@@ -51 +56 @@
       }
     }
-    
+
     public int FinishedCount {
       get {
-        return results.Count;
+            try {
+              resultsLock.EnterReadLock();
+              return results.Count;
+             } finally { resultsLock.ExitReadLock(); }
       }
     }
@@ -60 +68 @@
     public IDictionary<Guid, HiveTask> Results {
       get {
-        return results;
+            try {
+              resultsLock.EnterReadLock();
+              return results;
+            } finally { resultsLock.ExitReadLock(); }
       }
     }
@@ -66 +77 @@
     public TaskDownloader(IEnumerable<Guid> jobIds) {
       this.taskIds = jobIds;
-      this.taskDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
+      this.taskDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
       this.taskDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(taskDownloader_ExceptionOccured);
       this.results = new Dictionary<Guid, HiveTask>();
     }
-    
+
     public void StartAsync() {
       foreach (Guid taskId in taskIds) {
-        Task task = ServiceLocator.Instance.CallHiveService(s => s.GetTask(taskId));
-
-        taskDownloader.DownloadTask(task,
+        taskDownloader.DownloadTaskDataAndTask(taskId,
           (localJob, itemJob) => {
             if (localJob != null && itemJob != null) {
@@ -85 +94 @@
               }
               hiveTask.Task = localJob;
-              this.results.Add(localJob.Id, hiveTask);
+              try {
+                resultsLock.EnterWriteLock();
+                this.results.Add(localJob.Id, hiveTask);
+              } finally { resultsLock.ExitWriteLock(); }
             }
           });
-      }      
+      }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

@@ -150 +150 @@
 
     #region INamedItem Members
-    public abstract bool CanChangeDescription { get; }
+    public abstract new bool CanChangeDescription { get; }
 
-    public abstract bool CanChangeName { get; }
+    public abstract new bool CanChangeName { get; }
 
-    public abstract string Description { get; set; }
+    public abstract new string Description { get; set; }
 
-    public abstract string Name { get; set; }
+    public abstract new string Name { get; set; }
     #endregion
 
     #region Events
-    public event EventHandler DescriptionChanged;
-    protected virtual void OnDescriptionChanged() {
-      var handler = DescriptionChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler ItemImageChanged;
-    protected virtual void OnItemImageChanged() {
-      var handler = ItemImageChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler ToStringChanged;
-    protected virtual void OnToStringChanged() {
-      var handler = ToStringChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler NameChanged;
-    protected virtual void OnNameChanged() {
-      var handler = NameChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler<CancelEventArgs<string>> NameChanging;
-    protected virtual void OnNameChanging(string value, bool cancel) {
-      var handler = NameChanging;
-      if (handler != null) handler(this, new CancelEventArgs<string>(value, cancel));
-    }
     public event EventHandler ExecutionTimeChanged;
     protected virtual void OnExecutionTimeChanged() {
@@ -198 +173 @@
 
     #region IItem Members
-    public virtual string ItemDescription {
+    public virtual new string ItemDescription {
       get { return item.ItemDescription; }
     }
 
-    public virtual Image ItemImage {
+    public virtual new Image ItemImage
+    {
       get { return item.ItemImage; }
     }
 
-    public virtual string ItemName {
+    public virtual new string ItemName
+    {
       get { return item.ItemName; }
     }
 
-    public virtual Version ItemVersion {
+    public virtual new Version ItemVersion
+    {
       get { return item.ItemVersion; }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -142 +142 @@
 
     protected void optimizer_NameChanging(object sender, CancelEventArgs<string> e) {
-      this.OnNameChanging(e.Value, e.Cancel);
+      OnNameChanging(new CancelEventArgs<string>(e.Value, e.Cancel));
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -29 +29 @@
   public static class PersistenceUtil {
     public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
-      MemoryStream memStream = new MemoryStream();
-      XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-      byte[] jobByteArray = memStream.ToArray();
-      memStream.Dispose();
-      return jobByteArray;
+      using (MemoryStream memStream = new MemoryStream()) {
+        XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
+        byte[] jobByteArray = memStream.ToArray();
+        return jobByteArray;
+      }
     }
 
     public static byte[] Serialize(object obj) {
-      MemoryStream memStream = new MemoryStream();
-      XmlGenerator.Serialize(obj, memStream);
-      byte[] jobByteArray = memStream.ToArray();
-      memStream.Dispose();
-      return jobByteArray;
+      using (MemoryStream memStream = new MemoryStream()) {
+        XmlGenerator.Serialize(obj, memStream);
+        byte[] jobByteArray = memStream.ToArray();
+        return jobByteArray;
+      }
     }
 
     public static T Deserialize<T>(byte[] sjob) {
-      MemoryStream memStream = new MemoryStream(sjob);
-      T job = XmlParser.Deserialize<T>(memStream);
-      memStream.Dispose();
-      return job;
+      using (MemoryStream memStream = new MemoryStream(sjob)) {
+        T job = XmlParser.Deserialize<T>(memStream);
+        return job;
+      }
     }
   }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/app.config

@@ -14 +14 @@
         <value>HeuristicLab 3.3.exe</value>
       </setting>
+      <setting name="ResultPollingInterval" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
+      <setting name="MaxParallelDownloads" serializeAs="String">
+        <value>2</value>
+      </setting>
+      <setting name="MaxRepeatServiceCalls" serializeAs="String">
+        <value>5</value>
+      </setting>
     </HeuristicLab.Clients.Hive.Settings>
   </applicationSettings>
   <system.serviceModel>
+    <behaviors>
+      <endpointBehaviors>
+        <behavior name="HiveBehaviorConfiguration">
+          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
+        </behavior>
+      </endpointBehaviors>
+    </behaviors>
     <bindings>
       <wsHttpBinding>
@@ -48 +64 @@
     </bindings>
     <client>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
+      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
         <identity>
           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -1 +1 @@
 obj
 Plugin.cs
+bin