Changeset 12969 for branches/gteufl/HeuristicLab.Services.Hive/3.3/ServiceContracts

Timestamp:

09/25/15 14:39:59 (9 years ago)

Author:

gkronber

Message:

#2478 merged all changes from trunk to branch before trunk-reintegration

Location:

branches/gteufl

Files:

• . (modified) (3 props)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs (modified) (12 diffs)

branches/gteufl

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.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.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll
+obj

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.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.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll
+obj

branches/gteufl/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -41 +41 @@
 
     [OperationContract]
-    IEnumerable<Task> GetTasks();
-
-    [OperationContract]
-    IEnumerable<LightweightTask> GetLightweightTasks(IEnumerable<Guid> taskIds);
-
-    [OperationContract]
-    IEnumerable<LightweightTask> GetLightweightChildTasks(Guid? parentTaskId, bool recursive, bool includeParent);
-
-    [OperationContract]
     IEnumerable<LightweightTask> GetLightweightJobTasks(Guid jobId);
 
@@ -65 +56 @@
 
     [OperationContract]
-    void DeleteTask(Guid taskId);
-
-    [OperationContract]
-    void DeleteChildTasks(Guid parentTaskId);
-
-    [OperationContract]
     Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
     #endregion
@@ -89 +74 @@
     Job GetJob(Guid id);
 
-    /// <summary>
-    /// Returns all task for the current user
-    /// </summary>
     [OperationContract]
     IEnumerable<Job> GetJobs();
 
-    /// <summary>
-    /// Returns all task in the hive (only for admins)
-    /// </summary>
-    /// <returns></returns>
-    [OperationContract]
-    IEnumerable<Job> GetAllJobs();
-
     [OperationContract]
     Guid AddJob(Job jobDto);
@@ -122 +97 @@
     IEnumerable<JobPermission> GetJobPermissions(Guid jobId);
 
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
     [OperationContract]
     bool IsAllowedPrivileged(); // current user may execute privileged task
     #endregion
+    #endregion
 
     #region Login Methods
@@ -142 +120 @@
     [OperationContract]
     Plugin GetPlugin(Guid pluginId);
-
-    [OperationContract]
-    Plugin GetPluginByHash(byte[] hash);
 
     [OperationContract]
@@ -155 +130 @@
     [OperationContract]
     IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
-
-    [OperationContract]
-    void DeletePlugin(Guid pluginId);
     #endregion
 
@@ -171 +143 @@
     #endregion
 
-    #region Resource Methods
-    [OperationContract]
-    IEnumerable<Resource> GetChildResources(Guid resourceId);
-    #endregion
-
     #region Slave Methods
     [OperationContract]
@@ -187 +154 @@
 
     [OperationContract]
-    SlaveGroup GetSlaveGroup(Guid slaveGroupId);
-
-    [OperationContract]
     IEnumerable<Slave> GetSlaves();
 
@@ -217 +181 @@
 
     [OperationContract]
-    IEnumerable<Task> GetTasksByResourceId(Guid resourceId);
-
-    [OperationContract]
     void TriggerEventManager(bool force);
 
@@ -234 +195 @@
 
     [OperationContract]
-    void UpdateDowntime(Downtime downtime);
+    void UpdateDowntime(Downtime downtimeDto);
 
     [OperationContract]
@@ -251 +212 @@
     [OperationContract]
     IEnumerable<UserPriority> GetUserPriorities();
-    #endregion
-
-    #region Statistics Methods
-    [OperationContract]
-    IEnumerable<Statistics> GetStatistics();
-    [OperationContract]
-    IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to);
     #endregion
   }

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.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.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll
+obj