Changeset 6452 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

06/20/11 14:16:53 (14 years ago)

Author:

cneumuel

Message:

#1233

• renamed UptimeCalendar and Appointment to Downtime
• added service methods to delete plugins and get plugin by hash
• made reverted TransactionManager change, made it non-static and added interface
• moved magic numbers to application settings

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Tests/ExperimentManagerTests.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Tests/HeuristicLab.Clients.Hive.Tests-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Tests/Mocks/MockServiceLocator.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/HiveClient.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/Appointment.cs (deleted)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/Downtime.cs (added)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs (modified) (2 diffs)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Appointment.cs (deleted)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/CalendarState.cs (deleted)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Downtime.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Project.cs (deleted)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/SlaveConfig.cs (deleted)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/UpTimeStatistics.cs (deleted)
• HeuristicLab.Services.Hive.Common/3.4/HeuristicLab.Services.Hive.Common-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/ITransactionManager.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.Common/3.4/Settings.Designer.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/Settings.settings (added)
• HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/HeuristicLab.Services.Hive.DataAccess-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs (modified) (5 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs (modified) (16 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Interfaces/IHiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/Settings.Designer.cs (added)
• HeuristicLab.Services.Hive.DataAccess/3.4/Settings.settings (added)
• HeuristicLab.Services.Hive.DataAccess/3.4/Tools/Prepare Hive Database.sql (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/TransactionManager.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/app.config (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/DaoTests.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/ServiceTests.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (33 diffs)
• HeuristicLab.Services.Hive/3.4/Interfaces/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/LifecycleManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.4/ServiceLocator.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs

@@ -277 +277 @@
         ServiceLocator.Instance.CallHiveService(service => {
           var appointments = service.GetScheduleForResource(resourceId);
-          ItemList<Appointment> ias = new ItemList<Appointment>();
+          ItemList<Downtime> ias = new ItemList<Downtime>();
           appointments.ForEach(a => ias.Add(a));
           scheduleView.Invoke(new Action(() => scheduleView.Content = ias));

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs

@@ -33 +33 @@
 namespace HeuristicLab.Clients.Hive.Administration.Views {
   [View("ScheduleView")]
-  [Content(typeof(IItemList<Appointment>), IsDefaultView = true)]
+  [Content(typeof(IItemList<Downtime>), IsDefaultView = true)]
   public partial class ScheduleView : ItemView {
-    public new IItemList<Appointment> Content {
-      get { return (IItemList<Appointment>)base.Content; }
+    public new IItemList<Downtime> Content {
+      get { return (IItemList<Downtime>)base.Content; }
       set { base.Content = value; }
     }
@@ -93 +93 @@
     private void UpdateCalendarFromContent() {
       offlineTimes.Clear();
-      foreach (Appointment app in Content) {
+      foreach (Downtime app in Content) {
         offlineTimes.Add(new HiveAppointment {
           AllDayEvent = app.AllDayEvent,
@@ -331 +331 @@
 
     private void btnSaveCal_Click(object sender, EventArgs e) {
-      List<Appointment> appointments = new List<Appointment>();
+      List<Downtime> appointments = new List<Downtime>();
       foreach (HiveAppointment app in offlineTimes) {
         if (app.Deleted) {
@@ -340 +340 @@
           });
         } else if (app.Changed) {
-          Appointment apdto = new Appointment {
+          Downtime apdto = new Downtime {
             AllDayEvent = app.AllDayEvent,
             EndDate = app.EndDate,
@@ -355 +355 @@
         //TODO: find a sane way to do this
         ServiceLocator.Instance.CallHiveService(service => {
-          foreach (Appointment app in appointments) {
+          foreach (Downtime app in appointments) {
             service.AddAppointment(app);
           }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
-using HeuristicLab.Hive;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore {
@@ -62 +60 @@
     public void UpdateJob(Job job) {
       CallHiveService(s => s.UpdateJob(job));
-    }
-
-    public Guid AddChildJob(Guid parentJobId, Job job, IJob jobDataObject) {
-      return CallHiveService(s => {
-        JobData jobData = new JobData();
-        IEnumerable<Type> types;
-        jobData.Data = PersistenceUtil.Serialize(jobDataObject, out types);
-        var plugins = new List<IPluginDescription>();
-        PluginUtil.CollectDeclaringPlugins(plugins, types);
-        job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, new List<Plugin>(), new List<Plugin>(), plugins);
-        return s.AddChildJob(parentJobId, job, jobData);
-      });
-    }
-
-    public IEnumerable<JobData> GetChildJobs(Guid? parentJobId) {
-      return CallHiveService(service => {
-        IEnumerable<LightweightJob> msg = service.GetLightweightChildJobs(parentJobId, false, false);
-
-        List<JobData> jobs = new List<JobData>();
-        foreach (LightweightJob ljob in msg)
-          jobs.Add(service.GetJobData(ljob.Id));
-
-        return jobs;
-      });
-    }
-
-    public void DeleteChildJobs(Guid jobId) {
-      CallHiveService(s => s.DeleteChildJobs(jobId));
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Tests/ExperimentManagerTests.cs

@@ -47 +47 @@
       rhc.HiveExperiment.HiveJobs.Add(new OptimizerHiveJob(optimizer));
       
-      HiveClient.StartExperiment((Exception ex) => TestContext.WriteLine(ex.ToString()), rhc);
+      HiveClient.StartExperiment((Exception ex) => TestContext.WriteLine(ex.ToString()), rhc, new CancellationToken());
 
       while (rhc.HiveExperiment.ExecutionState != Core.ExecutionState.Stopped) {
         Thread.Sleep(500);
       }
-
     }
 

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

@@ -363 +363 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Clients.Hive.Tests {
-  public class MockServiceLocator {
+  public class MockServiceLocator : IServiceLocator {
     private string username;
     public string Username {
@@ -28 +28 @@
       return call(GetService());
     }
+
+    #region IServiceLocator Members
+
+    public void CallHiveService(Action<IHiveService> call) {
+      // how to do this?
+    }
+
+    public T CallHiveService<T>(Func<IHiveService, T> call) {
+      // how to do this?
+      throw new NotImplementedException();
+    }
+
+    #endregion
   }
 }

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

@@ -120 +120 @@
     <None Include="app_services.config" />
     <None Include="app.config" />
-    <None Include="ClassDiagram2.cd" />
+    <None Include="ClassDiagram.cd" />
     <None Include="HeuristicLabClientsHivePlugin.cs.frame" />
     <Compile Include="Exceptions\AddJobToHiveException.cs" />
@@ -151 +151 @@
     <Compile Include="Exceptions\ServiceClientFactoryException.cs" />
     <Compile Include="ScopeExtensions.cs" />
-    <Compile Include="ServiceClients\Appointment.cs" />
+    <Compile Include="ServiceClients\Downtime.cs" />
     <Compile Include="ServiceClients\HiveItemCollection.cs" />
     <Compile Include="ServiceClients\IHiveItem.cs" />

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

@@ -192 +192 @@
     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(RefreshableHiveExperiment refreshableHiveExperiment, CancellationToken cancellationToken) {
       try {
@@ -285 +286 @@
           jobCount[0]++;
         }
-        JobData jobData = null;
-        List<IPluginDescription> plugins = null;
-
-        TryAndRepeat(() => { // workaround for persistence bug (thread-safe access to bitmaps) - remove later
-          if (hiveJob.ItemJob.ComputeInParallel && (hiveJob.ItemJob.Item is Optimization.Experiment || hiveJob.ItemJob.Item is Optimization.BatchRun)) {
-            hiveJob.Job.IsParentJob = true;
-            hiveJob.Job.FinishWhenChildJobsFinished = true;
-            jobData = hiveJob.GetAsJobData(true, out plugins);
-          } else {
-            hiveJob.Job.IsParentJob = false;
-            hiveJob.Job.FinishWhenChildJobsFinished = false;
-            jobData = hiveJob.GetAsJobData(false, out plugins);
-          }
-        }, 30, "Could not serialize job");
+        JobData jobData;
+        List<IPluginDescription> plugins;
+
+        if (hiveJob.ItemJob.ComputeInParallel && (hiveJob.ItemJob.Item is Optimization.Experiment || hiveJob.ItemJob.Item is Optimization.BatchRun)) {
+          hiveJob.Job.IsParentJob = true;
+          hiveJob.Job.FinishWhenChildJobsFinished = true;
+          jobData = hiveJob.GetAsJobData(true, out plugins);
+        } else {
+          hiveJob.Job.IsParentJob = false;
+          hiveJob.Job.FinishWhenChildJobsFinished = false;
+          jobData = hiveJob.GetAsJobData(false, out plugins);
+        }
         cancellationToken.ThrowIfCancellationRequested();
 
         TryAndRepeat(() => {
           if (!cancellationToken.IsCancellationRequested) {
-            ServiceLocator.Instance.CallHiveService((s) => hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+            lock (pluginLocker) {
+              ServiceLocator.Instance.CallHiveService((s) => hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+            }
           }
         }, -1, "Failed to upload plugins");
@@ -333 +334 @@
             var arguments = (Tuple<HiveJob, HiveJob>)tuple;
             UploadJobWithChildren(progress, arguments.Item1, arguments.Item2, groups, jobCount, totalJobCount, configPluginId, hiveExperimentId, log, isPrivileged, cancellationToken);
-          }, new Tuple<HiveJob, HiveJob>(child, hiveJob ))
+          }, new Tuple<HiveJob, HiveJob>(child, hiveJob))
           .ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
         }

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

@@ -82 +82 @@
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.StateLog))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Appointment))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Downtime))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.PluginData))]
   public partial class HiveItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
@@ -938 +938 @@
       "nsfer")]
   [System.SerializableAttribute()]
-  public partial class Appointment : HeuristicLab.Clients.Hive.HiveItem {
+  public partial class Downtime : HeuristicLab.Clients.Hive.HiveItem {
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -1506 +1506 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddAppointment", ReplyAction = "http://tempuri.org/IHiveService/AddAppointmentResponse")]
-    System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
+    System.Guid AddAppointment(HeuristicLab.Clients.Hive.Downtime appointment);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteAppointment", ReplyAction = "http://tempuri.org/IHiveService/DeleteAppointmentResponse")]
@@ -1512 +1512 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateAppointment", ReplyAction = "http://tempuri.org/IHiveService/UpdateAppointmentResponse")]
-    void UpdateAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
+    void UpdateAppointment(HeuristicLab.Clients.Hive.Downtime appointment);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetScheduleForResource", ReplyAction = "http://tempuri.org/IHiveService/GetScheduleForResourceResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Appointment> GetScheduleForResource(System.Guid resourceId);
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Downtime> GetScheduleForResource(System.Guid resourceId);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddJob", ReplyAction = "http://tempuri.org/IHiveService/AddJobResponse")]
@@ -1694 +1694 @@
     }
 
-    public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment) {
+    public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Downtime appointment) {
       return base.Channel.AddAppointment(appointment);
     }
@@ -1702 +1702 @@
     }
 
-    public void UpdateAppointment(HeuristicLab.Clients.Hive.Appointment appointment) {
+    public void UpdateAppointment(HeuristicLab.Clients.Hive.Downtime appointment) {
       base.Channel.UpdateAppointment(appointment);
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Appointment> GetScheduleForResource(System.Guid resourceId) {
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Downtime> GetScheduleForResource(System.Guid resourceId) {
       return base.Channel.GetScheduleForResource(resourceId);
     }

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

@@ -30 +30 @@
 namespace HeuristicLab.Clients.Hive {
   public static class PluginUtil {
-    private static object locker = new object();
 
     /// <summary>
@@ -41 +40 @@
     /// <returns></returns>
     public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
-      lock (locker) {
-        var pluginIds = new List<Guid>();
-        Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
+      var pluginIds = new List<Guid>();
+      Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
 
-        foreach (var neededPlugin in checksumsNeededPlugins) {
-          Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Hash.SequenceEqual(neededPlugin.Value));
+      foreach (var neededPlugin in checksumsNeededPlugins) {
+        Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Hash.SequenceEqual(neededPlugin.Value));
+        if (foundPlugin == null) {
+          foundPlugin = onlinePlugins.FirstOrDefault(p => {
+            if (p.Hash != null) {
+              return p.Hash.SequenceEqual(neededPlugin.Value);
+            } else {
+              return false;
+            }
+          });
+
           if (foundPlugin == null) {
-            foundPlugin = onlinePlugins.FirstOrDefault(p => {
-              if (p.Hash != null) {
-                return p.Hash.SequenceEqual(neededPlugin.Value);
-              } else {
-                return false;
-              }
-            });
-
-            if (foundPlugin == null) {
-              Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
-              List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
-              try {
-                p.Id = service.AddPlugin(p, pd);
-                alreadyUploadedPlugins.Add(p);
-                pluginIds.Add(p.Id);
-              }
-              catch (FaultException<PluginAlreadyExistsFault> fault) {
-                onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
-              }
-            } else {
-              pluginIds.Add(foundPlugin.Id);
+            Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
+            List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
+            try {
+              p.Id = service.AddPlugin(p, pd);
+              alreadyUploadedPlugins.Add(p);
+              pluginIds.Add(p.Id);
+            }
+            catch (FaultException<PluginAlreadyExistsFault> fault) {
+              onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
             }
           } else {
             pluginIds.Add(foundPlugin.Id);
           }
+        } else {
+          pluginIds.Add(foundPlugin.Id);
         }
-        return pluginIds;
       }
+      return pluginIds;
     }
 

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

@@ -94 +94 @@
     #region constructors and cloning
     public HiveEngine() {
-      ResourceNames = "HEAL";
-      Priority = 0;
+      this.ResourceNames = "HEAL";
+      this.Priority = 0;
       this.log = new ThreadSafeLog(this.log);
     }

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

@@ -94 +94 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApplicationConstants.cs" />
     <Compile Include="DataTransfer\SlaveStatistics.cs" />
     <Compile Include="DataTransfer\Statistics.cs" />
     <Compile Include="DataTransfer\UserStatistics.cs" />
+    <Compile Include="ITransactionManager.cs" />
     <Compile Include="ServiceFaults\PluginAlreadyExistsFault.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <None Include="app.config" />
     <None Include="HeuristicLabServicesHiveCommonPlugin.cs.frame" />
-    <Compile Include="DataTransfer\Appointment.cs" />
+    <Compile Include="DataTransfer\Downtime.cs" />
     <Compile Include="DataTransfer\Command.cs" />
     <Compile Include="DataTransfer\HiveExperimentPermission.cs" />
@@ -125 +131 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <Compile Include="ServiceContracts\IHiveService.cs" />
+    <None Include="Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>

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

@@ -127 +127 @@
     Plugin GetPlugin(Guid pluginId);
     [OperationContract]
+    Plugin GetPluginByHash(byte[] hash);
+    [OperationContract]
     [FaultContract(typeof(PluginAlreadyExistsFault))]
     Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
@@ -133 +135 @@
     [OperationContract]
     IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
+    [OperationContract]
+    void DeletePlugin(Guid pluginId);
     #endregion
 
@@ -182 +186 @@
     #endregion
 
-    #region Appointment Methods
-    [OperationContract]
-    Guid AddAppointment(Appointment appointment);
-
-    [OperationContract]
-    void DeleteAppointment(Guid appointmentId);
-
-    [OperationContract]
-    void UpdateAppointment(Appointment appointment);
-
-    [OperationContract]
-    IEnumerable<Appointment> GetScheduleForResource(Guid resourceId);
+    #region Downtime Methods
+    [OperationContract]
+    Guid AddDowntime(Downtime downtime);
+
+    [OperationContract]
+    void DeleteDowntime(Guid downtimeId);
+
+    [OperationContract]
+    void UpdateDowntime(Downtime downtime);
+
+    [OperationContract]
+    IEnumerable<Downtime> GetDowntimesForResource(Guid resourceId);
     #endregion
   }

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

@@ -113 +113 @@
     #endregion
 
-    #region Appointment
-    public static DT.Appointment ToDto(UptimeCalendar source) {
-      if (source == null) return null;
-      return new DT.Appointment { Id = source.UptimeCalendarId, AllDayEvent = source.AllDayEvent, EndDate = source.EndDate, Recurring = source.Recurring, RecurringId = source.RecurringId, ResourceId = source.ResourceId, StartDate = source.StartDate };
-    }
-    public static UptimeCalendar ToEntity(DT.Appointment source) {
-      if (source == null) return null;
-      var entity = new UptimeCalendar(); ToEntity(source, entity);
-      return entity;
-    }
-    public static void ToEntity(DT.Appointment source, UptimeCalendar target) {
-      if ((source != null) && (target != null)) {
-        target.UptimeCalendarId = source.Id; target.AllDayEvent = source.AllDayEvent; target.EndDate = source.EndDate; target.Recurring = source.Recurring; target.RecurringId = source.RecurringId; target.ResourceId = source.ResourceId; target.StartDate = source.StartDate;
+    #region Downtimes
+    public static DT.Downtime ToDto(Downtime source) {
+      if (source == null) return null;
+      return new DT.Downtime { Id = source.DowntimeId, AllDayEvent = source.AllDayEvent, EndDate = source.EndDate, Recurring = source.Recurring, RecurringId = source.RecurringId, ResourceId = source.ResourceId, StartDate = source.StartDate };
+    }
+    public static Downtime ToEntity(DT.Downtime source) {
+      if (source == null) return null;
+      var entity = new Downtime(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.Downtime source, Downtime target) {
+      if ((source != null) && (target != null)) {
+        target.DowntimeId = source.Id; target.AllDayEvent = source.AllDayEvent; target.EndDate = source.EndDate; target.Recurring = source.Recurring; target.RecurringId = source.RecurringId; target.ResourceId = source.ResourceId; target.StartDate = source.StartDate;
       }
     }

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

@@ -109 +109 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-    <Compile Include="Properties\Settings.Designer.cs">
+    <Compile Include="Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -130 +130 @@
       <SubType>Designer</SubType>
     </None>
-    <None Include="Properties\Settings.settings">
+    <None Include="Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

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

@@ -24 +24 @@
 using System.Linq;
 using System.Linq.Expressions;
-using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Services.Hive.DataAccess.Properties;
 using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
@@ -33 +31 @@
     public static HiveDataContext CreateContext(bool longRunning = false) {
       var context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
-      if (longRunning) context.CommandTimeout = (int)ApplicationConstants.LongRunningDatabaseCommandTimeout.TotalSeconds;      
+      if (longRunning) context.CommandTimeout = (int)Settings.Default.LongRunningDatabaseCommandTimeout.TotalSeconds;      
       return context;
     }
@@ -109 +107 @@
                            where child.ParentJobId == ar.Job.JobId
                            select child).Count() > 0
-                    orderby ar.Job.Priority, db.Random() descending
+                    orderby ar.Job.Priority descending, db.Random()
                     select Convert.ToDto(ar.Job);
         return count == 0 ? query.ToArray() : query.Take(count).ToArray();
@@ -127 +125 @@
                        && ar.Job.CoresNeeded <= slave.FreeCores
                        && ar.Job.MemoryNeeded <= slave.FreeMemory
-                    orderby ar.Job.Priority, db.Random() descending // take random job to avoid the race condition that occurs when this method is called concurrently (the same job would be returned)
+                    orderby ar.Job.Priority descending, db.Random() // take random job to avoid the race condition that occurs when this method is called concurrently (the same job would be returned)
                     select Convert.ToDto(ar.Job);
         var waitingJobs = (count == 0 ? query : query.Take(count)).ToArray();
@@ -634 +632 @@
     #endregion
 
-    #region Appointment Methods
-    public Appointment GetAppointment(Guid id) {
-      using (var db = CreateContext()) {
-        return Convert.ToDto(db.UptimeCalendars.SingleOrDefault(x => x.UptimeCalendarId == id));
-      }
-    }
-
-    public IEnumerable<Appointment> GetAppointments(Expression<Func<UptimeCalendar, bool>> predicate) {
-      using (var db = CreateContext()) {
-        return db.UptimeCalendars.Where(predicate).Select(x => Convert.ToDto(x)).ToArray();
-      }
-    }
-
-    public Guid AddAppointment(Appointment dto) {
-      using (var db = CreateContext()) {
-        var entity = Convert.ToEntity(dto);
-        db.UptimeCalendars.InsertOnSubmit(entity);
-        db.SubmitChanges();
-        return entity.UptimeCalendarId;
-      }
-    }
-
-    public void UpdateAppointment(Appointment dto) {
-      using (var db = CreateContext()) {
-        var entity = db.UptimeCalendars.FirstOrDefault(x => x.UptimeCalendarId == dto.Id);
-        if (entity == null) db.UptimeCalendars.InsertOnSubmit(Convert.ToEntity(dto));
-        else Convert.ToEntity(dto, entity);
-        db.SubmitChanges();
-      }
-    }
-
-    public void DeleteAppointment(Guid id) {
-      using (var db = CreateContext()) {
-        var entity = db.UptimeCalendars.FirstOrDefault(x => x.UptimeCalendarId == id);
-        if (entity != null) db.UptimeCalendars.DeleteOnSubmit(entity);
+    #region Downtime Methods
+    public DT.Downtime GetDowntime(Guid id) {
+      using (var db = CreateContext()) {
+        return Convert.ToDto(db.Downtimes.SingleOrDefault(x => x.DowntimeId == id));
+      }
+    }
+
+    public IEnumerable<DT.Downtime> GetDowntimes(Expression<Func<Downtime, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.Downtimes.Where(predicate).Select(x => Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public Guid AddDowntime(DT.Downtime dto) {
+      using (var db = CreateContext()) {
+        var entity = Convert.ToEntity(dto);
+        db.Downtimes.InsertOnSubmit(entity);
+        db.SubmitChanges();
+        return entity.DowntimeId;
+      }
+    }
+
+    public void UpdateDowntime(DT.Downtime dto) {
+      using (var db = CreateContext()) {
+        var entity = db.Downtimes.FirstOrDefault(x => x.DowntimeId == dto.Id);
+        if (entity == null) db.Downtimes.InsertOnSubmit(Convert.ToEntity(dto));
+        else Convert.ToEntity(dto, entity);
+        db.SubmitChanges();
+      }
+    }
+
+    public void DeleteDowntime(Guid id) {
+      using (var db = CreateContext()) {
+        var entity = db.Downtimes.FirstOrDefault(x => x.DowntimeId == id);
+        if (entity != null) db.Downtimes.DeleteOnSubmit(entity);
         db.SubmitChanges();
       }

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.Hive" Class="HiveDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
+  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
   <Table Name="dbo.AssignedResources" Member="AssignedResources">
     <Type Name="AssignedResource">
@@ -38 +39 @@
       <Association Name="Resource_AssignedResource" Member="AssignedResources" ThisKey="ResourceId" OtherKey="ResourceId" Type="AssignedResource" />
       <Association Name="Resource_Resource" Member="ChildResources" ThisKey="ResourceId" OtherKey="ParentResourceId" Type="Resource" />
-      <Association Name="Resource_UptimeCalendar" Member="UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeCalendar" />
+      <Association Name="Resource_Downtime" Member="Downtimes" Storage="_UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="Downtime" />
       <Association Name="Resource_StateLog" Member="StateLogs" ThisKey="ResourceId" OtherKey="SlaveId" Type="StateLog" />
       <Association Name="Resource_Resource" Member="ParentResource" ThisKey="ParentResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" />
@@ -82 +83 @@
     </Type>
   </Table>
-  <Table Name="dbo.UptimeCalendar" Member="UptimeCalendars">
-    <Type Name="UptimeCalendar">
-      <Column Name="UptimeCalendarId" Type="System.Guid" DbType="UniqueIdentifier" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+  <Table Name="dbo.Downtime" Member="Downtimes">
+    <Type Name="Downtime">
+      <Column Name="DowntimeId" Storage="_UptimeCalendarId" Type="System.Guid" DbType="UniqueIdentifier" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
       <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
       <Column Name="StartDate" Type="System.DateTime" DbType="DateTime" CanBeNull="false" />
@@ -91 +92 @@
       <Column Name="Recurring" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
       <Column Name="RecurringId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
-      <Association Name="Resource_UptimeCalendar" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" />
+      <Association Name="Resource_Downtime" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" />
     </Type>
   </Table>

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

@@ -34 +34 @@
     </classShape>
     <classShape Id="8d5712f7-7a1a-4a89-bd4d-fd60200d3306" absoluteBounds="13.5, 2.5, 2, 2.1554996744791666">
-      <DataClassMoniker Name="/HiveDataContext/UptimeCalendar" />
+      <DataClassMoniker Name="/HiveDataContext/Downtime" />
       <nestedChildShapes>
         <elementListCompartment Id="7d8f121b-35bb-4753-a25f-3fac1562e68e" absoluteBounds="13.515, 2.9600000000000009, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
@@ -69 +69 @@
       </nodes>
     </inheritanceConnector>
-    <associationConnector edgePoints="[(11.9843735 : 2.57859537760417); (11.9843735 : 4.69314697265625); (10.875 : 4.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(12.25 : 2.57859537760417); (12.25 : 4.69314697265625); (10.875 : 4.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_AssignedResource" />
       <nodes>
@@ -97 +97 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(12.781252 : 2.57859537760417); (12.781252 : 3.54212367513021); (13.5 : 3.54212367513021)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_UptimeCalendar" />
-      <nodes>
-        <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
-        <classShapeMoniker Id="8d5712f7-7a1a-4a89-bd4d-fd60200d3306" />
-      </nodes>
-    </associationConnector>
     <classShape Id="6bc13f26-f9a8-4597-b054-35be34190d12" absoluteBounds="4.125, 1, 2, 1.3862939453125">
       <DataClassMoniker Name="/HiveDataContext/JobData" />
@@ -228 +221 @@
       </nodes>
     </associationConnector>
+    <associationConnector edgePoints="[(12.781252 : 2.57859537760417); (12.781252 : 3.64829952604167); (13.5 : 3.64829952604167)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_Downtime" />
+      <nodes>
+        <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
+        <classShapeMoniker Id="8d5712f7-7a1a-4a89-bd4d-fd60200d3306" />
+      </nodes>
+    </associationConnector>
   </nestedChildShapes>
 </ordesignerObjectsDiagram>

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

@@ -12 +12 @@
 namespace HeuristicLab.Services.Hive.DataAccess
 {
-  using System.Data.Linq;
-  using System.Data.Linq.Mapping;
-  using System.Data;
-  using System.Collections.Generic;
-  using System.Reflection;
-  using System.Linq;
-  using System.Linq.Expressions;
-  using System.ComponentModel;
-  using System;
+  using System;
+  using System.ComponentModel;
+  using System.Data.Linq;
+  using System.Data.Linq.Mapping;
   
   
@@ -46 +41 @@
     partial void UpdateJob(Job instance);
     partial void DeleteJob(Job instance);
-    partial void InsertUptimeCalendar(UptimeCalendar instance);
-    partial void UpdateUptimeCalendar(UptimeCalendar instance);
-    partial void DeleteUptimeCalendar(UptimeCalendar instance);
+    partial void InsertDowntime(Downtime instance);
+    partial void UpdateDowntime(Downtime instance);
+    partial void DeleteDowntime(Downtime instance);
     partial void InsertHiveExperiment(HiveExperiment instance);
     partial void UpdateHiveExperiment(HiveExperiment instance);
@@ -81 +76 @@
     #endregion
     
+    public HiveDataContext() : 
+        base(global::HeuristicLab.Services.Hive.DataAccess.Settings.Default.HeuristicLab_Hive_LinqConnectionString, mappingSource)
+    {
+      OnCreated();
+    }
+    
     public HiveDataContext(string connection) : 
         base(connection, mappingSource)
@@ -145 +146 @@
     }
     
-    public System.Data.Linq.Table<UptimeCalendar> UptimeCalendars
-    {
-      get
-      {
-        return this.GetTable<UptimeCalendar>();
+    public System.Data.Linq.Table<Downtime> Downtimes
+    {
+      get
+      {
+        return this.GetTable<Downtime>();
       }
     }
@@ -877 +878 @@
     private EntitySet<Resource> _ChildResources;
     
-    private EntitySet<UptimeCalendar> _UptimeCalendars;
+    private EntitySet<Downtime> _UptimeCalendars;
     
     private EntitySet<StateLog> _StateLogs;
@@ -901 +902 @@
       this._AssignedResources = new EntitySet<AssignedResource>(new Action<AssignedResource>(this.attach_AssignedResources), new Action<AssignedResource>(this.detach_AssignedResources));
       this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
-      this._UptimeCalendars = new EntitySet<UptimeCalendar>(new Action<UptimeCalendar>(this.attach_UptimeCalendars), new Action<UptimeCalendar>(this.detach_UptimeCalendars));
+      this._UptimeCalendars = new EntitySet<Downtime>(new Action<Downtime>(this.attach_UptimeCalendars), new Action<Downtime>(this.detach_UptimeCalendars));
       this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
       this._ParentResource = default(EntityRef<Resource>);
@@ -1017 +1018 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_UptimeCalendar", Storage="_UptimeCalendars", ThisKey="ResourceId", OtherKey="ResourceId")]
-    public EntitySet<UptimeCalendar> UptimeCalendars
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Downtime", Storage="_UptimeCalendars", ThisKey="ResourceId", OtherKey="ResourceId")]
+    public EntitySet<Downtime> Downtimes
     {
       get
@@ -1121 +1122 @@
     }
     
-    private void attach_UptimeCalendars(UptimeCalendar entity)
+    private void attach_UptimeCalendars(Downtime entity)
     {
       this.SendPropertyChanging();
@@ -1127 +1128 @@
     }
     
-    private void detach_UptimeCalendars(UptimeCalendar entity)
+    private void detach_UptimeCalendars(Downtime entity)
     {
       this.SendPropertyChanging();
@@ -2040 +2041 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.UptimeCalendar")]
-  public partial class UptimeCalendar : INotifyPropertyChanging, INotifyPropertyChanged
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Downtime")]
+  public partial class Downtime : INotifyPropertyChanging, INotifyPropertyChanged
   {
     
@@ -2066 +2067 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnUptimeCalendarIdChanging(System.Guid value);
-    partial void OnUptimeCalendarIdChanged();
+    partial void OnDowntimeIdChanging(System.Guid value);
+    partial void OnDowntimeIdChanged();
     partial void OnResourceIdChanging(System.Guid value);
     partial void OnResourceIdChanged();
@@ -2082 +2083 @@
     #endregion
     
-    public UptimeCalendar()
+    public Downtime()
     {
       this._Resource = default(EntityRef<Resource>);
@@ -2089 +2090 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UptimeCalendarId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier", IsPrimaryKey=true, IsDbGenerated=true)]
-    public System.Guid UptimeCalendarId
+    public System.Guid DowntimeId
     {
       get
@@ -2099 +2100 @@
         if ((this._UptimeCalendarId != value))
         {
-          this.OnUptimeCalendarIdChanging(value);
+          this.OnDowntimeIdChanging(value);
           this.SendPropertyChanging();
           this._UptimeCalendarId = value;
-          this.SendPropertyChanged("UptimeCalendarId");
-          this.OnUptimeCalendarIdChanged();
+          this.SendPropertyChanged("DowntimeId");
+          this.OnDowntimeIdChanged();
         }
       }
@@ -2232 +2233 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_UptimeCalendar", Storage="_Resource", ThisKey="ResourceId", OtherKey="ResourceId", IsForeignKey=true, DeleteRule="CASCADE")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_Downtime", Storage="_Resource", ThisKey="ResourceId", OtherKey="ResourceId", IsForeignKey=true, DeleteRule="CASCADE")]
     public Resource Resource
     {
@@ -2249 +2250 @@
           {
             this._Resource.Entity = null;
-            previousValue.UptimeCalendars.Remove(this);
+            previousValue.Downtimes.Remove(this);
           }
           this._Resource.Entity = value;
           if ((value != null))
           {
-            value.UptimeCalendars.Add(this);
+            value.Downtimes.Add(this);
             this._ResourceId = value.ResourceId;
           }

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

@@ -129 +129 @@
     #endregion
 
-    #region Appointment Methods
-    DT.Appointment GetAppointment(Guid id);
-    IEnumerable<DT.Appointment> GetAppointments(Expression<Func<UptimeCalendar, bool>> predicate);
-    Guid AddAppointment(DT.Appointment dto);
-    void UpdateAppointment(DT.Appointment dto);
-    void DeleteAppointment(Guid id);
+    #region Downtime Methods
+    DT.Downtime GetDowntime(Guid id);
+    IEnumerable<DT.Downtime> GetDowntimes(Expression<Func<Downtime, bool>> predicate);
+    Guid AddDowntime(DT.Downtime dto);
+    void UpdateDowntime(DT.Downtime dto);
+    void DeleteDowntime(Guid id);
     #endregion
 

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

@@ -73 +73 @@
 ALTER TABLE dbo.Resource WITH NOCHECK ADD CONSTRAINT [DF_Resource_ResourceId] DEFAULT (NEWSEQUENTIALID()) FOR ResourceId;
 
-ALTER TABLE dbo.UptimeCalendar ALTER COLUMN UptimeCalendarId ADD ROWGUIDCOL;
-ALTER TABLE dbo.UptimeCalendar WITH NOCHECK ADD CONSTRAINT [DF_UptimeCalendar_UptimeCalendarId] DEFAULT (NEWSEQUENTIALID()) FOR UptimeCalendarId;
+ALTER TABLE dbo.Downtime ALTER COLUMN DowntimeId ADD ROWGUIDCOL;
+ALTER TABLE dbo.Downtime WITH NOCHECK ADD CONSTRAINT [DF_Downtime_DowntimeId] DEFAULT (NEWSEQUENTIALID()) FOR DowntimeId;
 
 ALTER TABLE dbo.HiveExperiment ALTER COLUMN HiveExperimentId ADD ROWGUIDCOL;

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

@@ -24 +24 @@
 using HeuristicLab.Services.Hive.Common;
 
-namespace HeuristicLab.Services.Hive.DataAccess {
-  public static class TransactionManager {
-    public static void UseTransaction(Action call, bool serializable = false, bool longRunning = false) {
+namespace HeuristicLab.Services.Hive.DataAccess {  
+  public class TransactionManager : ITransactionManager {    
+    public void UseTransaction(Action call, bool serializable = false, bool longRunning = false) {
       int n = 10;
       while (n > 0) {
@@ -46 +46 @@
     }
 
-    public static T UseTransaction<T>(Func<T> call, bool serializable = false, bool longRunning = false) {
+    public T UseTransaction<T>(Func<T> call, bool serializable = false, bool longRunning = false) {
       int n = 10;
       while (n > 0) {
@@ -68 +68 @@
     }
 
-    private static TransactionScope CreateTransaction(bool serializable, bool longRunning) {
+    private TransactionScope CreateTransaction(bool serializable, bool longRunning) {
       var options = new TransactionOptions();
       if (serializable)
@@ -76 +76 @@
 
       if (longRunning)
-        options.Timeout = ApplicationConstants.LongRunningDatabaseCommandTimeout;
+        options.Timeout = Settings.Default.LongRunningDatabaseCommandTimeout;
 
       return new TransactionScope(TransactionScopeOption.Required, options);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/app.config

@@ -2 +2 @@
 <configuration>
   <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <section name="HeuristicLab.Services.Hive.DataAccess.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
   </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;" providerName="System.Data.SqlClient"/>
+    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
+      connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup><applicationSettings>
+    <HeuristicLab.Services.Hive.DataAccess.Settings>
+      <setting name="LongRunningDatabaseCommandTimeout" serializeAs="String">
+        <value>00:05:00</value>
+      </setting>
+    </HeuristicLab.Services.Hive.DataAccess.Settings>
+  </applicationSettings>
+</configuration>

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

@@ -70 +70 @@
       plugin1.UserId = Guid.Empty;
       plugin1.DateCreated = DateTime.Now;
+      plugin1.Hash = new byte[] { 1, 2, 3 };
 
       DT.PluginData pluginData1 = new DT.PluginData();
@@ -135 +136 @@
       Assert.AreEqual(null, dao.GetJobData(job1.Id));
       Assert.AreEqual(null, dao.GetHiveExperiment(he.Id));
+
+      dao.DeletePlugin(plugin1.Id);
+      Assert.AreEqual(null, dao.GetPlugin(plugin1.Id));
     }
 
@@ -177 +181 @@
       plugin1.Version = new Version("1.0.0.0");
       plugin1.UserId = Guid.Empty;
+      plugin1.Hash = new byte[] { 1, 2, 3 };
 
       plugin1.Id = dao.AddPlugin(plugin1);
@@ -186 +191 @@
       Assert.AreEqual(plugin1.UserId, plugin1loaded.UserId);
       Assert.AreEqual(plugin1.DateCreated.ToString(), plugin1loaded.DateCreated.ToString());
+      Assert.IsTrue(plugin1.Hash.SequenceEqual(plugin1loaded.Hash));
 
       DT.PluginData pluginData1 = new DT.PluginData();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs

@@ -20 +20 @@
 #endregion
 
-
 namespace HeuristicLab.Services.Hive.Tests.Mocks {
   public class MockLifecycleManager : ILifecycleManager {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs

@@ -44 +44 @@
 
     public ILifecycleManager LifecycleManager {
-      get {
-        return defaultServiceLocator.LifecycleManager;
-      }
+      get { return defaultServiceLocator.LifecycleManager; }
+    }
+    public ITransactionManager TransactionManager {
+      get { return defaultServiceLocator.TransactionManager; }
     }
 
     public HeartbeatManager HeartbeatManager {
-      get {
-        return defaultServiceLocator.HeartbeatManager;
-      }
+      get { return defaultServiceLocator.HeartbeatManager; }
     }
-
   }
 }

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

@@ -66 +66 @@
       };
 
+      // delete plugin first (otherwise the system would not allow it because of the same hash code
+      var hash = new byte[] { 1, 2, 3 };
+      var p = service.GetPluginByHash(hash);
+      if (p != null) service.DeletePlugin(p.Id);
+
       // create plugin
       DT.Plugin plugin1 = new DT.Plugin();
@@ -72 +77 @@
       plugin1.UserId = Guid.Empty;
       plugin1.DateCreated = DateTime.Now;
-
+      plugin1.Hash = hash;
+      
       DT.PluginData pluginData1 = new DT.PluginData();
       pluginData1.FileName = "Tests.MyPlugin-1.0.dll";
@@ -167 +173 @@
       Assert.AreEqual(job.Id, actions[0].JobId);
 
-      // create appointment which should make slave unavailable for calculation
-      Guid appointmentId = service.AddAppointment(new Appointment { ResourceId = slave.Id, StartDate = DateTime.Now - TimeSpan.FromMinutes(1), EndDate = DateTime.Now + TimeSpan.FromMinutes(1), Recurring = false });
+      // create downtime which should make slave unavailable for calculation
+      Guid downtimeId = service.AddDowntime(new Downtime { ResourceId = slave.Id, StartDate = DateTime.Now - TimeSpan.FromMinutes(1), EndDate = DateTime.Now + TimeSpan.FromMinutes(1), Recurring = false });
 
       progress.Clear();
@@ -177 +183 @@
       Assert.AreEqual(Guid.Empty, actions[0].JobId);
 
-      service.DeleteAppointment(appointmentId);
+      service.DeleteDowntime(downtimeId);
 
       // delete

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config

@@ -2 +2 @@
 <configuration>
 
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <section name="HeuristicLab.Services.Hive.DataAccess.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+      <section name="HeuristicLab.Services.Hive.Common.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+
+  <applicationSettings>
+    <HeuristicLab.Services.Hive.DataAccess.Settings>
+      <!-- Timeout for long running database command (storing or loading jobData) -->
+      <setting name="LongRunningDatabaseCommandTimeout" serializeAs="String">
+        <value>00:05:33</value>
+      </setting>
+    </HeuristicLab.Services.Hive.DataAccess.Settings>
+    
+    <HeuristicLab.Services.Hive.Common.Settings>
+      <!-- If a slave does not send a heartbeat for this time, it is set offline which means all of its jobs are rescheduled -->
+      <setting name="SlaveHeartbeatTimeout" serializeAs="String">
+        <value>00:01:00</value>
+      </setting>
+
+      <!-- When a job is in state `Calculating` this is the maximum time it does not have to send heartbeats, otherwise its rescheduled -->
+      <setting name="CalculatingJobHeartbeatTimeout" serializeAs="String">
+        <value>00:05:30</value>
+      </setting>
+
+      <!-- When a job is in state `Transferring` this is the maximum time it does not have to send heartbeats, otherwise its rescheduled --> 
+      <setting name="TransferringJobHeartbeatTimeout" serializeAs="String">
+        <value>00:05:30</value>
+      </setting>
+    </HeuristicLab.Services.Hive.Common.Settings>
+  </applicationSettings>
+  
   <connectionStrings>
     <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>

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

@@ -142 +142 @@
 
     private bool SlaveIsAllowedToCalculate(Guid slaveId) {
-      // appointment==doNotCompute! the slave may only calculate if there is no appointment right now. this needs to be checked for every parent resource also
-      return dao.GetParentResources(slaveId).All(r => dao.GetAppointments(x => x.ResourceId == r.Id && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() == 0);
+      // the slave may only calculate if there is no downtime right now. this needs to be checked for every parent resource also
+      return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() == 0);
     }
   }

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

@@ -27 +27 @@
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using DA = HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive {
@@ -45 +44 @@
     private IAuthorizationManager author {
       get { return ServiceLocator.Instance.AuthorizationManager; }
+    }  
+    private ITransactionManager trans {
+      get { return ServiceLocator.Instance.TransactionManager; }
     }
     private ILifecycleManager lifecycleManager {
@@ -56 +58 @@
     public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         job.Id = dao.AddJob(job);
         jobData.JobId = job.Id;
@@ -71 +73 @@
     public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         job.ParentJobId = parentJobId;
         return AddJob(job, jobData, dao.GetAssignedResources(parentJobId).Select(x => x.Id));
@@ -109 +111 @@
     public void UpdateJob(Job job) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.UpdateJob(job);
       });
@@ -116 +118 @@
     public void UpdateJobData(Job job, JobData jobData) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      //DA.TransactionManager.UseTransaction(() => { // cneumuel: try without transaction
+      //trans.UseTransaction(() => { // cneumuel: try without transaction
       jobData.LastUpdate = DateTime.Now;
       dao.UpdateJob(job);
@@ -125 +127 @@
     public void DeleteJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.DeleteJob(jobId);
       });
@@ -132 +134 @@
     public void DeleteChildJobs(Guid parentJobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var jobs = GetChildJobs(parentJobId, true, false);
         foreach (var job in jobs) {
@@ -143 +145 @@
     public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         Job job = dao.UpdateJobState(jobId, jobState, slaveId, userId, exception);
 
@@ -161 +163 @@
       });
     }
+
+    public IEnumerable<Job> GetJobsByResourceId(Guid resourceId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator);
+      return trans.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
+    }
     #endregion
 
@@ -166 +173 @@
     public void StopJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var job = dao.GetJob(jobId);
         if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
@@ -181 +188 @@
     public void PauseJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var job = dao.GetJob(jobId);
         if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
@@ -194 +201 @@
     public void RestartJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         Job job = dao.UpdateJobState(jobId, JobState.Waiting, null, author.UserId, string.Empty);
         job.Command = null;
@@ -223 +230 @@
     public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         hiveExperimentDto.OwnerUserId = author.UserId;
         hiveExperimentDto.DateCreated = DateTime.Now;
@@ -232 +239 @@
     public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.UpdateHiveExperiment(hiveExperimentDto);
       });
@@ -239 +246 @@
     public void DeleteHiveExperiment(Guid hiveExperimentId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         HiveExperiment he = dao.GetHiveExperiment(hiveExperimentId);
         dao.DeleteHiveExperiment(hiveExperimentId); // child jobs will be deleted by db-trigger
@@ -249 +256 @@
     public void Hello(Slave slaveInfo) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var slave = dao.GetSlave(slaveInfo.Id);
 
@@ -280 +287 @@
     public void GoodBye(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var slave = dao.GetSlave(slaveId);
         if (slave != null) {
@@ -294 +301 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
       TriggerLifecycle(false);
-      return DA.TransactionManager.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
+      return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
     }
     #endregion
@@ -301 +308 @@
     public Guid AddPlugin(Plugin plugin, List<PluginData> pluginDatas) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         plugin.UserId = author.UserId;
         plugin.DateCreated = DateTime.Now;
@@ -325 +332 @@
     }
 
+    public Plugin GetPluginByHash(byte[] hash) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
+      return dao.GetPlugins(x => x.Hash == hash).FirstOrDefault();
+    }
+
     public IEnumerable<Plugin> GetPlugins() {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
@@ -334 +346 @@
       List<PluginData> pluginDatas = new List<PluginData>();
 
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         foreach (Guid guid in pluginIds) {
           pluginDatas.AddRange(dao.GetPluginDatas(x => x.PluginId == guid).ToList());
@@ -342 +354 @@
     }
 
+    public void DeletePlugin(Guid pluginId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
+      dao.DeletePlugin(pluginId);
+    }
     #endregion
 
@@ -347 +363 @@
     public Guid AddSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => dao.AddSlave(slave));
+      return trans.UseTransaction(() => dao.AddSlave(slave));
     }
 
     public Guid AddSlaveGroup(SlaveGroup slaveGroup) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
+      return trans.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
     }
 
@@ -377 +393 @@
     public void UpdateSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.UpdateSlave(slave);
       });
@@ -384 +400 @@
     public void UpdateSlaveGroup(SlaveGroup slaveGroup) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.UpdateSlaveGroup(slaveGroup);
       });
@@ -391 +407 @@
     public void DeleteSlave(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.DeleteSlave(slaveId);
       });
@@ -398 +414 @@
     public void DeleteSlaveGroup(Guid slaveGroupId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         dao.DeleteSlaveGroup(slaveGroupId);
       });
@@ -405 +421 @@
     public void AddResourceToGroup(Guid slaveGroupId, Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var resource = dao.GetResource(resourceId);
         resource.ParentResourceId = slaveGroupId;
@@ -414 +430 @@
     public void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         var resource = dao.GetResource(resourceId);
         resource.ParentResourceId = null;
@@ -423 +439 @@
     public Guid GetResourceId(string resourceName) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return DA.TransactionManager.UseTransaction(() => {
+      return trans.UseTransaction(() => {
         var resource = dao.GetResources(x => x.Name == resourceName).FirstOrDefault();
         if (resource != null) {
@@ -435 +451 @@
     public void TriggerLifecycle(bool force) {
       // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
-      DA.TransactionManager.UseTransaction(() => {
+      trans.UseTransaction(() => {
         DateTime lastCleanup = dao.GetLastCleanup();
         if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
@@ -462 +478 @@
     #endregion
 
-    #region Appointment Methods
-    public Guid AddAppointment(Appointment appointment) {
+    #region Downtime Methods
+    public Guid AddDowntime(Downtime downtime) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return DA.TransactionManager.UseTransaction(() => dao.AddAppointment(appointment));
-    }
-
-    public void DeleteAppointment(Guid appointmentId) {
+      return trans.UseTransaction(() => dao.AddDowntime(downtime));
+    }
+
+    public void DeleteDowntime(Guid downtimeId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      DA.TransactionManager.UseTransaction(() => {
-        dao.DeleteAppointment(appointmentId);
-      });
-    }
-
-    public void UpdateAppointment(Appointment appointment) {
+      trans.UseTransaction(() => {
+        dao.DeleteDowntime(downtimeId);
+      });
+    }
+
+    public void UpdateDowntime(Downtime downtime) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      DA.TransactionManager.UseTransaction(() => {
-        dao.UpdateAppointment(appointment);
-      });
-    }
-
-    public IEnumerable<Appointment> GetScheduleForResource(Guid resourceId) {
+      trans.UseTransaction(() => {
+        dao.UpdateDowntime(downtime);
+      });
+    }
+
+    public IEnumerable<Downtime> GetDowntimesForResource(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return DA.TransactionManager.UseTransaction(() => dao.GetAppointments(x => x.ResourceId == resourceId));
-    }
-
-    public IEnumerable<Job> GetJobsByResourceId(Guid resourceId) {
-      authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return DA.TransactionManager.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
+      return trans.UseTransaction(() => dao.GetDowntimes(x => x.ResourceId == resourceId));
     }
     #endregion

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

@@ -28 +28 @@
     IHiveDao HiveDao { get; }
     ILifecycleManager LifecycleManager { get; }
+    ITransactionManager TransactionManager { get; }
     HeartbeatManager HeartbeatManager { get; }
   }

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

@@ -76 +76 @@
       var slaves = dao.GetSlaves(x => x.SlaveState != SlaveState.Offline);
       foreach (Slave slave in slaves) {
-        if (!slave.LastHeartbeat.HasValue || (DateTime.Now - slave.LastHeartbeat.Value) > ApplicationConstants.SlaveHeartbeatTimeout) {
+        if (!slave.LastHeartbeat.HasValue || (DateTime.Now - slave.LastHeartbeat.Value) > Settings.Default.SlaveHeartbeatTimeout) {
           slave.SlaveState = SlaveState.Offline;
           SetJobsWaiting(slave.Id);
@@ -107 +107 @@
     /// </summary>
     private void SetTimeoutJobsWaiting() {
-      var jobs = dao.GetJobs(x => (x.State == JobState.Calculating && (DateTime.Now - x.LastHeartbeat) > ApplicationConstants.CalculatingJobHeartbeatTimeout)
-                               || (x.State == JobState.Transferring && (DateTime.Now - x.LastHeartbeat) > ApplicationConstants.TransferringJobHeartbeatTimeout));
+      var jobs = dao.GetJobs(x => (x.State == JobState.Calculating && (DateTime.Now - x.LastHeartbeat) > Settings.Default.CalculatingJobHeartbeatTimeout)
+                               || (x.State == JobState.Transferring && (DateTime.Now - x.LastHeartbeat) > Settings.Default.TransferringJobHeartbeatTimeout));
       foreach (var j in jobs) {
         Job job = dao.UpdateJobState(j.Id, JobState.Waiting, null, null, "Slave timed out.");

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

@@ -66 +66 @@
     }
 
+    private ITransactionManager transactionManager;
+    public ITransactionManager TransactionManager {
+      get {
+        if (transactionManager == null) transactionManager = new TransactionManager();
+        return transactionManager;
+      }
+    }
+
     private HeartbeatManager heartbeatManager;
     public HeartbeatManager HeartbeatManager {