Changeset 9363 for branches/OaaS/HeuristicLab.Services.Hive/3.3/ServiceContracts

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

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

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

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

@@ -53 +53 @@
 
     [OperationContract]
+    IEnumerable<LightweightTask> GetLightweightJobTasksWithoutStateLog(Guid jobId);
+
+    [OperationContract]
     TaskData GetTaskData(Guid taskId);
 
@@ -168 +171 @@
     #endregion
 
+    #region Resource Methods
+    [OperationContract]
+    IEnumerable<Resource> GetChildResources(Guid resourceId);
+    #endregion
+
     #region Slave Methods
     [OperationContract]
@@ -238 +246 @@
     [OperationContract]
     Guid GetUserIdByUsername(string username);
+    #endregion
+
+    #region UserPriorities Methods
+    [OperationContract]
+    IEnumerable<UserPriority> GetUserPriorities();
+    #endregion
+
+    #region Statistics Methods
+    [OperationContract]
+    IEnumerable<Statistics> GetStatistics();
+    [OperationContract]
+    IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to);
     #endregion
   }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages