Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/18/10 17:23:09 (14 years ago)
Author:
cneumuel
Message:

some small refactorings (#1159)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3
Files:
1 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4253 r4254  
    135135    <Compile Include="RecurrentEvent.cs" />
    136136    <Compile Include="ResponseCalendar.cs" />
    137     <Compile Include="ResponseSerializedJob.cs" />
    138137    <Compile Include="MultiStream.cs" />
    139138    <Compile Include="Interfaces\ISlaveFacade.cs" />
    … …  
    145144    <Compile Include="Interfaces\IServerConsoleFacade.cs" />
    146145    <Compile Include="MessageContainer.cs" />
    147     <Compile Include="ResponseJob.cs" />
    148146    <Compile Include="HeuristicLabHiveContractsPlugin.cs" />
    149147    <Compile Include="Interfaces\ISlaveCommunicator.cs" />
    150148    <Compile Include="Properties\AssemblyInfo.cs" />
    151149    <Compile Include="Response.cs" />
    152     <Compile Include="ResponseHB.cs" />
     150    <Compile Include="ResponseHeartBeat.cs" />
    153151    <Compile Include="ResponseList.cs" />
    154     <Compile Include="ResponsePlugin.cs" />
    155152    <Compile Include="ResponseResultReceived.cs" />
    156153    <Compile Include="StreamedObject.cs" />

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs

    r4170 r4254  
    3333  [ServiceContract]
    3434  public interface IJobManager {
     35
    3536    [OperationContract]
    3637    ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count);
     38
    3739    [OperationContract]
    3840    ResponseList<JobDto> GetAllJobs();
     41
    3942    [OperationContract]
    4043    ResponseObject<JobDto> GetJobById(Guid jobId);
     44
    4145    [OperationContract]
    4246    ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId);
     47
    4348    [OperationContract]
    4449    ResponseObject<JobDto> AddNewJob(SerializedJob job);
     50
    4551    [OperationContract]
    4652    Response RemoveJob(Guid jobId);
     53
    4754    [OperationContract]
    4855    ResponseObject<JobDto> GetLastJobResultOf(Guid jobId);
     56
    4957    [OperationContract]
    5058    ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot);
     59
    5160    [OperationContract]
    5261    ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
     62
    5363    [OperationContract]
    5464    Response RequestSnapshot(Guid jobId);
     65
    5566    [OperationContract]
    5667    Response AbortJob(Guid jobId);
     68
    5769    [OperationContract]
    5870    ResponseList<ProjectDto> GetAllProjects();
     71
    5972    [OperationContract]
    6073    Response CreateProject(ProjectDto project);
     74
    6175    [OperationContract]
    6276    Response ChangeProject(ProjectDto project);
     77
    6378    [OperationContract]
    6479    Response DeleteProject(Guid projectId);
     80
    6581    [OperationContract]
    6682    ResponseList<JobDto> GetJobsByProject(Guid projectId);
     83
    6784    [OperationContract]
    6885    ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources);

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveCommunicator.cs

    r4253 r4254  
    3434  [ServiceContract]
    3535  public interface ISlaveCommunicator {
     36
    3637    [OperationContract]
    3738    Response Login(ClientDto clientInfo);
     39
    3840    [OperationContract]
    39     ResponseHB ProcessHeartBeat(HeartBeatData hbData);
     41    ResponseHeartBeat ProcessHeartBeat(HeartBeatData hbData);
     42
    4043    [OperationContract]
    41     ResponseJob SendJob(Guid clientId);
    42     //[OperationContract]
    43     //ResponseSerializedJob SendSerializedJob(Guid clientId);
     44    ResponseObject<JobDto> GetJob(Guid clientId);
     45
    4446    [OperationContract]
    45     ResponseResultReceived StoreFinishedJobResult(Guid clientId,
    46       Guid jobId,
    47       byte[] result,
    48       double percentage,
    49       string exception);
     47    ResponseResultReceived StoreFinishedJobResult(Guid clientId, Guid jobId, byte[] result, double percentage, string exception);
     48
    5049    [OperationContract]
    51     ResponseResultReceived ProcessSnapshot(Guid clientId,
    52       Guid jobId,
    53       byte[] result,
    54       double percentage,
    55       string exception);
     50    ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, string exception);
     51
    5652    [OperationContract]
    5753    Response Logout(Guid clientId);
     54
    5855    [OperationContract]
    5956    Response IsJobStillNeeded(Guid jobId);
     57
    6058    [OperationContract]
    61     ResponsePlugin SendPlugins(List<HivePluginInfoDto> pluginList);
     59    ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList);
    6260
    6361    [OperationContract]
    6462    ResponseCalendar GetCalendar(Guid clientId);
     63
    6564    [OperationContract]
    6665    Response SetCalendarStatus(Guid clientId, CalendarState state);

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveManager.cs

    r4253 r4254  
    3333  [ServiceContract]
    3434  public interface ISlaveManager {
     35
    3536    [OperationContract]
    3637    ResponseList<ClientDto> GetAllClients();
     38
    3739    [OperationContract]
    3840    [ServiceKnownType(typeof (ResourceDto))]
    … …  
    4042    [ServiceKnownType(typeof(ClientGroupDto))]
    4143    ResponseList<ClientGroupDto> GetAllClientGroups();
     44
    4245    [OperationContract]
    4346    ResponseObject<ClientGroupDtoList> GetAllGroupsOfResource(Guid resourceId);
     47
    4448    [OperationContract]
    4549    ResponseObject<ClientGroupDto> AddClientGroup(ClientGroupDto clientGroup);
     50
    4651    [OperationContract]
    4752    Response DeleteClientGroup(Guid clientGroupId);
     53
    4854    [OperationContract]
    4955    [ServiceKnownType(typeof(ResourceDto))]
    … …  
    5157    [ServiceKnownType(typeof(ClientGroupDto))]
    5258    Response AddResourceToGroup(Guid clientGroupId, ResourceDto resource);
     59
    5360    [OperationContract]
    5461    Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId);
     62
    5563    [OperationContract]
    5664    ResponseList<UpTimeStatisticsDto> GetAllUpTimeStatistics();
     65
    5766    [OperationContract]
    5867    ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid);
     68
    5969    [OperationContract]
    6070    Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments, bool isForced);

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/MessageContainer.cs

    r4133 r4254  
    5858      MessageContainer clone = (MessageContainer)Activator.CreateInstance(this.GetType(), true);
    5959      cloner.RegisterClonedObject(this, clone);
    60       //clone.StatusMessage = this.StatusMessage;
    61       //clone.Success = this.Success;
     60      clone.Message = this.Message;
     61      clone.JobId = this.JobId;
    6262      return clone;
    6363    }

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ResponseObject.cs

    r4133 r4254  
    3131  [StorableClass]
    3232  [DataContract]
     33  [Serializable]
    3334  public class ResponseObject<T> : Response
    3435    where T : IDeepCloneable {

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ResponsePlugin.cs

    r4133 r4254  
    1111  [DataContract]
    1212  [Serializable]
    13   public class ResponsePlugin : Response {
     13  public class ResponsePlugin : ResponseBase {
    1414    [Storable]
    1515    [DataMember]

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ResponseSerializedJob.cs

    r4133 r4254  
    3737  [DataContract]
    3838  [Serializable]
    39   public class ResponseSerializedJob : Response {
     39  public class ResponseSerializedJob : ResponseBase {
    4040    [Storable]
    4141    [DataMember]
Note: See TracChangeset for help on using the changeset viewer.