Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/12/11 18:04:25 (13 years ago)
Author:
ascheibe
Message:

#1233

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

Legend:

Unmodified
Added
Removed

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

    r6725 r6743  
    3333    #region Task Methods
    3434    [OperationContract]
    35     Guid AddJob(Task job, TaskData jobData, IEnumerable<Guid> resourceIds);
    36 
    37     [OperationContract]
    38     Guid AddChildJob(Guid parentJobId, Task job, TaskData jobData);
    39 
    40     [OperationContract]
    41     Task GetJob(Guid jobId);
    42 
    43     [OperationContract]
    44     IEnumerable<Task> GetJobs();
    45 
    46     [OperationContract]
    47     IEnumerable<LightweightTask> GetLightweightJobs(IEnumerable<Guid> jobIds);
    48 
    49     [OperationContract]
    50     IEnumerable<LightweightTask> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent);
    51 
    52     [OperationContract]
    53     IEnumerable<LightweightTask> GetLightweightExperimentJobs(Guid experimentId);
    54 
    55     [OperationContract]
    56     TaskData GetJobData(Guid jobId);
    57 
    58     [OperationContract]
    59     void UpdateJob(Task jobDto);
    60 
    61     [OperationContract]
    62     void UpdateJobData(Task jobDto, TaskData jobDataDto);
    63 
    64     [OperationContract]
    65     void DeleteJob(Guid jobId);
    66 
    67     [OperationContract]
    68     void DeleteChildJobs(Guid parentJobId);
    69 
    70     [OperationContract]
    71     Task UpdateJobState(Guid jobId, TaskState jobState, Guid? slaveId, Guid? userId, string exception);
    72     #endregion
    73 
    74     #region Job Control Methods
    75     [OperationContract]
    76     void StopJob(Guid jobId);
    77 
    78     [OperationContract]
    79     void PauseJob(Guid jobId);
    80 
    81     [OperationContract]
    82     void RestartJob(Guid jobId);
     35    Guid AddTask(Task task, TaskData taskData, IEnumerable<Guid> resourceIds);
     36
     37    [OperationContract]
     38    Guid AddChildTask(Guid parentTaskId, Task task, TaskData taskData);
     39
     40    [OperationContract]
     41    Task GetTask(Guid taskId);
     42
     43    [OperationContract]
     44    IEnumerable<Task> GetTasks();
     45
     46    [OperationContract]
     47    IEnumerable<LightweightTask> GetLightweightTasks(IEnumerable<Guid> taskIds);
     48
     49    [OperationContract]
     50    IEnumerable<LightweightTask> GetLightweightChildTasks(Guid? parentTaskId, bool recursive, bool includeParent);
     51
     52    [OperationContract]
     53    IEnumerable<LightweightTask> GetLightweightJobTasks(Guid jobId);
     54
     55    [OperationContract]
     56    TaskData GetTaskData(Guid taskId);
     57
     58    [OperationContract]
     59    void UpdateTask(Task taskDto);
     60
     61    [OperationContract]
     62    void UpdateTaskData(Task taskDto, TaskData taskDataDto);
     63
     64    [OperationContract]
     65    void DeleteTask(Guid taskId);
     66
     67    [OperationContract]
     68    void DeleteChildTasks(Guid parentTaskId);
     69
     70    [OperationContract]
     71    Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
     72    #endregion
     73
     74    #region Task Control Methods
     75    [OperationContract]
     76    void StopTask(Guid taskId);
     77
     78    [OperationContract]
     79    void PauseTask(Guid taskId);
     80
     81    [OperationContract]
     82    void RestartTask(Guid taskId);
    8383    #endregion
    8484
    8585    #region Job Methods
    8686    [OperationContract]
    87     Job GetHiveExperiment(Guid id);
     87    Job GetJob(Guid id);
    8888
    8989    /// <summary>
    90     /// Returns all experiments for the current user
     90    /// Returns all task for the current user
    9191    /// </summary>
    9292    [OperationContract]
    93     IEnumerable<Job> GetHiveExperiments();
     93    IEnumerable<Job> GetJobs();
    9494
    9595    /// <summary>
    96     /// Returns all experiments in the hive (only for admins)
     96    /// Returns all task in the hive (only for admins)
    9797    /// </summary>
    9898    /// <returns></returns>
    9999    [OperationContract]
    100     IEnumerable<Job> GetAllHiveExperiments();
    101 
    102     [OperationContract]
    103     Guid AddHiveExperiment(Job hiveExperimentDto);
    104 
    105     [OperationContract]
    106     void UpdateHiveExperiment(Job hiveExperimentDto);
    107 
    108     [OperationContract]
    109     void DeleteHiveExperiment(Guid hiveExperimentId);
    110     #endregion
    111 
    112     #region HiveExperimentPermission Methods
    113     [OperationContract]
    114     void GrantPermission(Guid hiveExperimentId, Guid grantedUserId, Permission permission);
     100    IEnumerable<Job> GetAllJobs();
     101
     102    [OperationContract]
     103    Guid AddJob(Job jobDto);
     104
     105    [OperationContract]
     106    void UpdateJob(Job jobDto);
     107
     108    [OperationContract]
     109    void DeleteJob(Guid JobId);
     110    #endregion
     111
     112    #region JobPermission Methods
     113    [OperationContract]
     114    void GrantPermission(Guid jobId, Guid grantedUserId, Permission permission);
    115115
    116116    [OperationContract]
    … …  
    118118
    119119    [OperationContract]
    120     IEnumerable<JobPermission> GetHiveExperimentPermissions(Guid hiveExperimentId);
    121 
    122     [OperationContract]
    123     bool IsAllowedPrivileged(); // current user may execute privileged jobs
     120    IEnumerable<JobPermission> GetJobPermissions(Guid jobId);
     121
     122    [OperationContract]
     123    bool IsAllowedPrivileged(); // current user may execute privileged task
    124124    #endregion
    125125
    … …  
    140140    [OperationContract]
    141141    Plugin GetPlugin(Guid pluginId);
     142
    142143    [OperationContract]
    143144    Plugin GetPluginByHash(byte[] hash);
     145
    144146    [OperationContract]
    145147    [FaultContract(typeof(PluginAlreadyExistsFault))]
    146148    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
     149
    147150    [OperationContract]
    148151    IEnumerable<Plugin> GetPlugins();
     152
    149153    [OperationContract]
    150154    IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
     155
    151156    [OperationContract]
    152157    void DeletePlugin(Guid pluginId);
    … …  
    194199
    195200    [OperationContract]
    196     IEnumerable<Task> GetJobsByResourceId(Guid resourceId);
     201    IEnumerable<Task> GetTasksByResourceId(Guid resourceId);
    197202
    198203    [OperationContract]
Note: See TracChangeset for help on using the changeset viewer.