Changeset 4263


Ignore:
Timestamp:
08/19/10 12:41:05 (12 years ago)
Author:
cneumuel
Message:

consolidated Response objects to use only StatusMessage with enums instead of strings.
removed Success property from Response. success is now represented by StatusMessage alone. (#1159)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
13 added
26 deleted
35 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ApplicationConstants.cs

    r4141 r4263  
    3838    public static int JOB_TIME_TO_LIVE = 5;
    3939
    40     public static string RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS = "Logged in";
    41     public static string RESPONSE_SERVERCONSOLE_LOGIN_FAILED = "Login failed";
     40    //public static string RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS = "Logged in";
     41    //public static string RESPONSE_SERVERCONSOLE_LOGIN_FAILED = "Login failed";
    4242
    43     public static string RESPONSE_USERROLE_GET_ALL_USERS = "UserRole.GetAllUsers";
    44     public static string RESPONSE_USERROLE_USER_EXISTS_ALLREADY = "UserRole.UserExistsAllready";
    45     public static string RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED = "UserRole.UserSuccessfullyAdded";
    46     public static string RESPONSE_USERROLE_USER_DOESNT_EXIST = "UserRole.UserDoesntExist";
    47     public static string RESPONSE_USERROLE_USER_REMOVED = "UserRole.UserRemoved";
    48     public static string RESPONSE_USERROLE_USERGROUP_EXISTS_ALLREADY = "UserRole.UsergroupExistsAllready";
    49     public static string RESPONSE_USERROLE_USERGROUP_ADDED = "UserRole.UserGroupAdded";
    50     public static string RESPONSE_USERROLE_USERGROUP_DOESNT_EXIST = "UserRole.UserGroupDoesntExist";
    51     public static string RESPONSE_USERROLE_PERMISSIONOWNER_DOESNT_EXIST = "UserRole.PermissionOwnerDoesntExist";
    52     public static string RESPONSE_USERROLE_PERMISSIONOWNER_REMOVED = "UserRole.PermissionOwnerRemoved";
    53     public static string RESPONSE_USERROLE_PERMISSIONOWNER_ADDED = "UserRole.PermissionOwnerAdded";
    54     public static string RESPONSE_USERROLE_GET_ALL_USERGROUPS = "UserRole.AllUserGroupsReturned";
    55     public static string RESPONSE_USERROLE_ID_MUST_NOT_BE_SET = "UserRole.IdMustNotBeSet";
    56     public static string RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP = "UserRole.UserGroupAddedToUserGroup";
    57     public static string RESPONSE_USERROLE_USERNAME_EXISTS_ALLREADY = "UserRole.UsernameExistsAllready";
     43    //public static string RESPONSE_USERROLE_GET_ALL_USERS = "UserRole.GetAllUsers";
     44    //public static string RESPONSE_USERROLE_USER_EXISTS_ALLREADY = "UserRole.UserExistsAllready";
     45    //public static string RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED = "UserRole.UserSuccessfullyAdded";
     46    //public static string RESPONSE_USERROLE_USER_DOESNT_EXIST = "UserRole.UserDoesntExist";
     47    //public static string RESPONSE_USERROLE_USER_REMOVED = "UserRole.UserRemoved";
     48    //public static string RESPONSE_USERROLE_USERGROUP_EXISTS_ALLREADY = "UserRole.UsergroupExistsAllready";
     49    //public static string RESPONSE_USERROLE_USERGROUP_ADDED = "UserRole.UserGroupAdded";
     50    //public static string RESPONSE_USERROLE_USERGROUP_DOESNT_EXIST = "UserRole.UserGroupDoesntExist";
     51    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_DOESNT_EXIST = "UserRole.PermissionOwnerDoesntExist";
     52    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_REMOVED = "UserRole.PermissionOwnerRemoved";
     53    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_ADDED = "UserRole.PermissionOwnerAdded";
     54    //public static string RESPONSE_USERROLE_GET_ALL_USERGROUPS = "UserRole.AllUserGroupsReturned";
     55    //public static string RESPONSE_USERROLE_ID_MUST_NOT_BE_SET = "UserRole.IdMustNotBeSet";
     56    //public static string RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP = "UserRole.UserGroupAddedToUserGroup";
     57    //public static string RESPONSE_USERROLE_USERNAME_EXISTS_ALLREADY = "UserRole.UsernameExistsAllready";
    5858
    59     public static string RESPONSE_CLIENT_GET_ALL_CLIENTS = "Client.GetAllClients";
    60     public static string RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS = "Client.GetAllClientGroups";
    61     public static string RESPONSE_CLIENT_ID_MUST_NOT_BE_SET = "Client.IdMustNotBeSet";
    62     public static string RESPONSE_CLIENT_CLIENTGROUP_ADDED = "Client.ClientGroupAdded";
    63     public static string RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST = "Client.ClientGroupDoesntExist";
    64     public static string RESPONSE_CLIENT_CLIENTGROUP_DELETED = "Client group sucessfully deleted";
    65     public static string RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP = "Client.ResourceAddedToGroup";
    66     public static string RESPONSE_CLIENT_RESOURCE_REMOVED = "Client.ResourceRemoved";
    67     public static string RESPONSE_CLIENT_RESOURCE_NOT_FOUND = "Client.ResourceNotFound";
    68     public static string RESPONSE_CLIENT_PERMISSIONOWNER_DOESNT_EXIST = "Client.PermissionOwnerDoesntExist";
    69     public static string RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT = "Get all groups of a client";
     59    //public static string RESPONSE_CLIENT_GET_ALL_CLIENTS = "Client.GetAllClients";
     60    //public static string RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS = "Client.GetAllClientGroups";
     61    //public static string RESPONSE_CLIENT_ID_MUST_NOT_BE_SET = "Client.IdMustNotBeSet";
     62    //public static string RESPONSE_CLIENT_CLIENTGROUP_ADDED = "Client.ClientGroupAdded";
     63    //public static string RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST = "Client.ClientGroupDoesntExist";
     64    //public static string RESPONSE_CLIENT_CLIENTGROUP_DELETED = "Client group sucessfully deleted";
     65    //public static string RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP = "Client.ResourceAddedToGroup";
     66    //public static string RESPONSE_CLIENT_RESOURCE_REMOVED = "Client.ResourceRemoved";
     67    //public static string RESPONSE_CLIENT_RESOURCE_NOT_FOUND = "Client.ResourceNotFound";
     68    //public static string RESPONSE_CLIENT_PERMISSIONOWNER_DOESNT_EXIST = "Client.PermissionOwnerDoesntExist";
     69    //public static string RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT = "Get all groups of a client";
    7070
    71     public static string RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED = "Communicator.HeardbeatReceived";
    72     public static string RESPONSE_COMMUNICATOR_JOB_PULLED = "Communicator.JobPulled";
    73     public static string RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED = "Communicator.JobResultReceived";
    74     public static string RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE = "Communicator.LoginUserAllreadyOnline";
    75     public static string RESPONSE_COMMUNICATOR_LOGIN_SUCCESS = "Communicator.LoginSuccess";
    76     public static string RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED = "Communicator.LogoutClientNotRegistered";
    77     public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
    78     public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
    79     public static string RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET = "Communicator.IdMustNotBeSet";
    80     public static string RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID = "Communicator.NoJobWithThisId";
    81     public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
    82     public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
    83     public static string RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED = "Communicator.JobIsNotBeenigCalculated";
    84     public static string RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB = "Communicator.WrongClientForJob";
    85     public static string RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED = "Job allready finished. Not needed anymore";
    86     public static string RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST = "No job exists with this id";
    87     public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
    88     public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
    89     public static string RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL = "Communicator.PluginsNotAvail";
    90     public static string RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
     71    //public static string RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED = "Communicator.HeardbeatReceived";
     72    //public static string RESPONSE_COMMUNICATOR_JOB_PULLED = "Communicator.JobPulled";
     73    //public static string RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED = "Communicator.JobResultReceived";
     74    //public static string RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE = "Communicator.LoginUserAllreadyOnline";
     75    //public static string RESPONSE_COMMUNICATOR_LOGIN_SUCCESS = "Communicator.LoginSuccess";
     76    //public static string RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED = "Communicator.LogoutClientNotRegistered";
     77    //public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
     78    //public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
     79    //public static string RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET = "Communicator.IdMustNotBeSet";
     80    //public static string RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID = "Communicator.NoJobWithThisId";
     81    //public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
     82    //public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
     83    //public static string RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED = "Communicator.JobIsNotBeenigCalculated";
     84    //public static string RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB = "Communicator.WrongClientForJob";
     85    //public static string RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED = "Job allready finished. Not needed anymore";
     86    //public static string RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST = "No job exists with this id";
     87    //public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
     88    //public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
     89    //public static string RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL = "Communicator.PluginsNotAvail";
     90    //public static string RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
    9191
    92     public static string RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR = "new Calendar must be fetched / force fetched";
     92    //public static string RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR = "new Calendar must be fetched / force fetched";
    9393
    94     public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";
    95     public static string RESPONSE_JOB_GET_JOB_BY_ID = "Job.GetJobById";
    96     public static string RESPONSE_JOB_ID_MUST_NOT_BE_SET = "Job.IdMustNotBeSet";
    97     public static string RESPONSE_JOB_JOB_ADDED = "Job.JobAdded";
    98     public static string RESPONSE_JOB_JOB_NULL = "Job.JobNull";
    99     public static string RESPONSE_JOB_JOB_DOESNT_EXIST = "JobDoesntExist";
    100     public static string RESPONSE_JOB_JOB_REMOVED = "Job.JobRemoved";
    101     public static string RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE = "Job.JobStateMustBeOffline";
    102     public static string RESPONSE_JOB_IS_NOT_BEEING_CALCULATED = "Job.IsNotBeeingCalculated";
    103     public static string RESPONSE_JOB_JOB_RESULT_SENT = "Job.JobResultSent";
    104     public static string RESPONSE_JOB_REQUEST_ALLREADY_SET = "Job.RequestAllreadySet";
    105     public static string RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET = "Job.AbortRequestAllreadySet";
    106     public static string RESPONSE_JOB_REQUEST_SET = "Job.RequestSet";
    107     public static string RESPONSE_JOB_ABORT_REQUEST_SET = "Job.AbortRequestSet";
    108     public static string RESPONSE_JOB_RESULT_NOT_YET_HERE = "Requested job result is not yet finished";
    109     public static string RESPONSE_JOB_PROJECT_NAME_EMPTY = "Please specifiy a project name";
    110     public static string RESPONSE_JOB_PROJECT_ADDED = "Project successfully added";
    111     public static string RESPONSE_JOB_PROJECT_DOESNT_EXIST = "The specified project doesn't exist";
    112     public static string RESPONSE_JOB_PROJECT_DELETED = "The project was sucessfully deleted";
     94    //public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";
     95    //public static string RESPONSE_JOB_GET_JOB_BY_ID = "Job.GetJobById";
     96    //public static string RESPONSE_JOB_ID_MUST_NOT_BE_SET = "Job.IdMustNotBeSet";
     97    //public static string RESPONSE_JOB_JOB_ADDED = "Job.JobAdded";
     98    //public static string RESPONSE_JOB_JOB_NULL = "Job.JobNull";
     99    //public static string RESPONSE_JOB_JOB_DOESNT_EXIST = "JobDoesntExist";
     100    //public static string RESPONSE_JOB_JOB_REMOVED = "Job.JobRemoved";
     101    //public static string RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE = "Job.JobStateMustBeOffline";
     102    //public static string RESPONSE_JOB_IS_NOT_BEEING_CALCULATED = "Job.IsNotBeeingCalculated";
     103    //public static string RESPONSE_JOB_JOB_RESULT_SENT = "Job.JobResultSent";
     104    //public static string RESPONSE_JOB_REQUEST_ALLREADY_SET = "Job.RequestAllreadySet";
     105    //public static string RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET = "Job.AbortRequestAllreadySet";
     106    //public static string RESPONSE_JOB_REQUEST_SET = "Job.RequestSet";
     107    //public static string RESPONSE_JOB_ABORT_REQUEST_SET = "Job.AbortRequestSet";
     108    //public static string RESPONSE_JOB_RESULT_NOT_YET_HERE = "Requested job result is not yet finished";
     109    //public static string RESPONSE_JOB_PROJECT_NAME_EMPTY = "Please specifiy a project name";
     110    //public static string RESPONSE_JOB_PROJECT_ADDED = "Project successfully added";
     111    //public static string RESPONSE_JOB_PROJECT_DOESNT_EXIST = "The specified project doesn't exist";
     112    //public static string RESPONSE_JOB_PROJECT_DELETED = "The project was sucessfully deleted";
    113113
    114     public static string RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND = "No Calendar could be found anywhere in the tree";
    115     public static string RESPONSE_UPTIMECALENDAR_STATUS_UPDATED = "Calendar status has been updated";
     114    //public static string RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND = "No Calendar could be found anywhere in the tree";
     115    //public static string RESPONSE_UPTIMECALENDAR_STATUS_UPDATED = "Calendar status has been updated";
    116116  }
    117117}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4254 r4263  
    134134    <Compile Include="BusinessObjects\ClientGroupDtoList.cs" />
    135135    <Compile Include="RecurrentEvent.cs" />
    136     <Compile Include="ResponseCalendar.cs" />
     136    <Compile Include="ResponseObjects\ResponseCalendar.cs" />
    137137    <Compile Include="MultiStream.cs" />
    138138    <Compile Include="Interfaces\ISlaveFacade.cs" />
    139139    <Compile Include="Interfaces\IExecutionEngineFacade.cs" />
    140     <Compile Include="ResponseObject.cs" />
     140    <Compile Include="ResponseObjects\ResponseObject.cs" />
    141141    <Compile Include="Interfaces\ISlaveManager.cs" />
    142142    <Compile Include="Interfaces\IJobManager.cs" />
     
    147147    <Compile Include="Interfaces\ISlaveCommunicator.cs" />
    148148    <Compile Include="Properties\AssemblyInfo.cs" />
    149     <Compile Include="Response.cs" />
    150     <Compile Include="ResponseHeartBeat.cs" />
    151     <Compile Include="ResponseList.cs" />
    152     <Compile Include="ResponseResultReceived.cs" />
     149    <Compile Include="ResponseObjects\Response.cs" />
     150    <Compile Include="ResponseObjects\ResponseHeartBeat.cs" />
     151    <Compile Include="ResponseObjects\ResponseList.cs" />
     152    <Compile Include="ResponseObjects\ResponseResultReceived.cs" />
     153    <Compile Include="ResponseStatus.cs" />
    153154    <Compile Include="StreamedObject.cs" />
    154155    <Compile Include="WcfSettings.cs" />
     
    157158    <None Include="HeuristicLab.snk" />
    158159    <None Include="Properties\AssemblyInfo.frame" />
    159   </ItemGroup>
    160   <ItemGroup>
    161     <EmbeddedResource Include="HiveServerMessages.resx">
    162       <SubType>Designer</SubType>
    163     </EmbeddedResource>
    164160  </ItemGroup>
    165161  <ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IExecutionEngineFacade.cs

    r4170 r4263  
    2626using System.ServiceModel;
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
     28using HeuristicLab.Hive.Contracts.ResponseObjects;
    2829
    2930namespace HeuristicLab.Hive.Contracts.Interfaces {
     
    4344    ResponseObject<JobDto> GetJobById(Guid jobId);
    4445    [OperationContract]
    45     ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
     46    ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds);
    4647  }
    4748}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs

    r4254 r4263  
    2626using System.ServiceModel;
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
     28using HeuristicLab.Hive.Contracts.ResponseObjects;
    2829
    2930namespace HeuristicLab.Hive.Contracts.Interfaces {
     
    4950    ResponseObject<JobDto> AddNewJob(SerializedJob job);
    5051
    51     [OperationContract]
    52     Response RemoveJob(Guid jobId);
     52    //[OperationContract]
     53    //Response RemoveJob(Guid jobId);
     54
     55    //[OperationContract]
     56    //ResponseObject<JobDto> GetLastJobResultOf(Guid jobId);
    5357
    5458    [OperationContract]
    55     ResponseObject<JobDto> GetLastJobResultOf(Guid jobId);
     59    ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot);
    5660
    5761    [OperationContract]
    58     ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot);
    59 
    60     [OperationContract]
    61     ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
     62    ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds);
    6263
    6364    [OperationContract]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IServerConsoleFacade.cs

    r4253 r4263  
    2626using System.ServiceModel;
    2727using System.Runtime.Serialization;
     28using HeuristicLab.Hive.Contracts.ResponseObjects;
    2829
    2930namespace HeuristicLab.Hive.Contracts.Interfaces {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveCommunicator.cs

    r4254 r4263  
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
    2828using HeuristicLab.PluginInfrastructure;
     29using HeuristicLab.Hive.Contracts.ResponseObjects;
    2930
    3031namespace HeuristicLab.Hive.Contracts.Interfaces {
     
    5758
    5859    [OperationContract]
    59     ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList);
     60    ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList);
    6061
    6162    [OperationContract]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveFacade.cs

    r4253 r4263  
    2727using System.IO;
    2828using HeuristicLab.Hive.Contracts.BusinessObjects;
     29using HeuristicLab.Hive.Contracts.ResponseObjects;
    2930
    3031namespace HeuristicLab.Hive.Contracts.Interfaces {
     
    3233  public interface ISlaveFacade: ISlaveCommunicator {
    3334    [OperationContract]
    34     Stream SendStreamedJob(Guid clientId);
     35    Stream GetStreamedJob(Guid clientId);
    3536
    3637    [OperationContract]
    37     Stream SendStreamedPlugins(List<HivePluginInfoDto> pluginList);
     38    Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList);
    3839
    3940    [OperationContract]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveManager.cs

    r4254 r4263  
    2626using System.ServiceModel;
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
     28using HeuristicLab.Hive.Contracts.ResponseObjects;
    2829
    2930namespace HeuristicLab.Hive.Contracts.Interfaces {
     
    3536
    3637    [OperationContract]
    37     ResponseList<ClientDto> GetAllClients();
     38    ResponseList<ClientDto> GetAllSlaves();
    3839
    3940    [OperationContract]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.cs

    r4173 r4263  
    3838        Content_JobStateChanged(this, EventArgs.Empty);
    3939        if (Content.LatestSnapshot != null) {
    40           snapshotStatusText.InvokeIfRequired(c => c.Text = Content.LatestSnapshot.StatusMessage);
     40          snapshotStatusText.InvokeIfRequired(c => c.Text = Content.LatestSnapshot.StatusMessage.ToString());
    4141          snapshotTimeText.InvokeIfRequired(c => { c.Text = Content.LatestSnapshotTime.ToString(); });
    4242        }
     
    9191      } else {
    9292        if (Content.LatestSnapshot != null) {
    93           snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage;
     93          snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage.ToString();
    9494          snapshotTimeText.Text = Content.LatestSnapshotTime.ToString();
    9595        } else {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

    r4173 r4263  
    4242using System.Collections;
    4343using System.ServiceModel;
     44using HeuristicLab.Hive.Contracts.ResponseObjects;
    4445
    4546namespace HeuristicLab.Hive.Experiment {
     
    561562              LogMessage("Polling results for " + jobIdsToQuery.Count() + " jobs");
    562563              try {
    563                 ResponseObject<JobResultList> response = executionEngineFacade.GetAllJobResults(jobIdsToQuery);
    564                 if (response.Success) {
     564                ResponseObject<JobResultList> response = executionEngineFacade.GetJobResults(jobIdsToQuery);
     565                if (response.StatusMessage == ResponseStatus.Ok) {
    565566                  JobResultList jobItemList = response.Obj;
    566567                  UpdateJobItems(jobItemList);
    567568
    568569                  LogMessage("Polling successfully finished");
     570                } else {
     571                  throw new Exception(response.StatusMessage.ToString());
    569572                }
    570573              } catch (Exception e) {
     
    603606
    604607        Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
    605         if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
     608        if (snapShotResponse.StatusMessage == ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated) {
    606609          // job already finished
    607610          Logger.Debug("HiveExperiment: Abort - GetLastResult(false)");
    608611          response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
    609           Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
     612          Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
    610613        } else {
    611614          // server sent snapshot request to client
     
    615618            Logger.Debug("HiveExperiment: Abort - GetLastResult(true)");
    616619            response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
    617             Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
     620            Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
    618621            retryCount++;
    619622            // loop while
     
    622625          } while (
    623626            (retryCount < maxSnapshotRetries) && (
    624             !response.Success ||
    625             response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
     627            response.StatusMessage == ResponseStatus.GetLastSerializedResult_JobResultNotYetThere)
    626628            );
    627629        }
    628         if (response.Success) {
     630        if (response.StatusMessage == ResponseStatus.Ok) {
    629631          LogMessage(jobId, "Snapshot polling successfull for job " + jobId);
    630632          UpdateSnapshot(response);
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

    r4173 r4263  
    1111using System.Diagnostics;
    1212using HeuristicLab.Optimization;
     13using HeuristicLab.Hive.Contracts.ResponseObjects;
    1314
    1415namespace HeuristicLab.Hive.Experiment {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

    r4253 r4263  
    3434using HeuristicLab.Core;
    3535using System.ServiceModel;
     36using HeuristicLab.Hive.Contracts.ResponseObjects;
    3637
    3738namespace HeuristicLab.Hive.Server.ServerConsole {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/CgCalendar.cs

    r4253 r4263  
    1313using HeuristicLab.Hive.Contracts;
    1414using System.Collections;
     15using HeuristicLab.Hive.Contracts.ResponseObjects;
    1516
    1617namespace HeuristicLab.Hive.Server.ServerConsole {
     
    5556      onlineTimes.Clear();
    5657      ResponseList<AppointmentDto> response = ServiceLocator.GetClientManager().GetUptimeCalendarForResource(ResourceId);
    57       if(response.Success) {
     58      if(response.StatusMessage == ResponseStatus.Ok) {
    5859        foreach (AppointmentDto appointmentDto in response.List) {
    5960          onlineTimes.Add(new Appointment {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs

    r2118 r4263  
    3535using System.Threading;
    3636using System.ServiceModel;
     37using HeuristicLab.Hive.Contracts.ResponseObjects;
    3738
    3839namespace HeuristicLab.Hive.Server.ServerConsole {
     
    9293          t.Abort();
    9394          this.Cursor = Cursors.Default;
    94           if (resp.Success == true) return true;
    95           lblError.Text = resp.StatusMessage;
     95          if (resp.StatusMessage == ResponseStatus.Ok) return true;
     96          lblError.Text = resp.StatusMessage.ToString();
    9697          MessageBox.Show("Wrong username or password");
    9798        }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

    r4253 r4263  
    3434using System.ServiceModel;
    3535using HeuristicLab.Tracing;
     36using HeuristicLab.Hive.Contracts.ResponseObjects;
    3637
    3738namespace HeuristicLab.Hive.Server.ServerConsole {
     
    280281
    281282    private void updaterWoker_DoWork(object sender, DoWorkEventArgs e) {
    282 
    283283      changes.Clear();
    284284
     
    412412      ResponseObject<JobDto> response = ServiceLocator.GetJobManager().GetJobByIdWithDetails(currentJob.Id);
    413413
    414       if(response.Success == false || response.Obj == null)
     414      if(response.StatusMessage != ResponseStatus.Ok || response.Obj == null)
    415415        return;
    416416
     
    702702        ResponseObject<ClientGroupDto> respcg = clientManager.AddClientGroup(cg);
    703703        Response res = clientManager.AddResourceToGroup(parentgroup, respcg.Obj);
    704         if (res != null && !res.Success) {
    705           MessageBox.Show(res.StatusMessage, "Error adding Group", MessageBoxButtons.OK, MessageBoxIcon.Error);
     704        if (res != null && res.StatusMessage != ResponseStatus.Ok) {
     705          MessageBox.Show(res.StatusMessage.ToString(), "Error adding Group", MessageBoxButtons.OK, MessageBoxIcon.Error);
    706706        }
    707707      } else {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs

    r4121 r4263  
    99using System.Threading;
    1010using HeuristicLab.Hive.Contracts.Interfaces;
     11using HeuristicLab.Hive.Contracts.ResponseObjects;
    1112
    1213namespace HeuristicLab.Hive.Server.ServerConsole {
     
    8788      for (int i = 0; i < pollStatesCopy.Length; i++) {
    8889        ResponseList<JobDto> resList = jobManager.GetAllJobsWithFilter(pollStatesCopy[i], CurrentPage * NrOfEntriesOnPage, NrOfEntriesOnPage);
    89         if (resList.Success) {
     90        if (resList.StatusMessage == ResponseStatus.Ok) {
    9091          if (resList.List.Count == 0) {
    9192            if (CurrentPage > 0) {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Authorization/HivePermissionManager.cs

    r4253 r4263  
    1111using HeuristicLab.Hive.Server.Core.InternalInterfaces;
    1212using System.ServiceModel;
     13using HeuristicLab.Hive.Contracts.ResponseObjects;
    1314
    1415namespace HeuristicLab.Hive.Server.Core {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

    r4254 r4263  
    3131        using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
    3232          ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
    33           LinkedList<JobDto> allOfflineJobsForSlave =
    34             new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
     33          LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
    3534          if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
    3635            jobToCalculate = allOfflineJobsForSlave.First.Value;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs

    r4170 r4263  
    2828using HeuristicLab.Hive.Contracts.BusinessObjects;
    2929using HeuristicLab.Hive.Server.DataAccess;
     30using HeuristicLab.Hive.Contracts.ResponseObjects;
    3031
    3132namespace HeuristicLab.Hive.Server.Core {
     
    6061    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
    6162      using (contextFactory.GetContext(false)) {
    62         return jobManager.GetLastSerializedJobResultOf(jobId, requested, snapshot);
     63        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
    6364      }
    6465    }
     
    7778
    7879
    79     public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
     80    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
    8081      using (contextFactory.GetContext(false)) {
    81         return jobManager.GetAllJobResults(jobIds);
     82        return jobManager.GetJobResults(jobIds);
    8283      }
    8384    }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

    r4253 r4263  
    3131using System.ServiceModel;
    3232using HeuristicLab.Hive.Server.DataAccess;
     33using HeuristicLab.Hive.Contracts.ResponseObjects;
    3334
    3435
     
    5354      sessionID = secMan.Login(username, password);
    5455      if (sessionID == Guid.Empty) {
    55         resp.Success = false;
    56         resp.StatusMessage = ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_FAILED;
    57       } else {
    58         resp.Success = true;
    59         resp.StatusMessage =
    60           ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS;
     56        resp.StatusMessage = ResponseStatus.Login_LoginFaild;
    6157      }
    6258      return resp;
     
    6460
    6561
    66     public ResponseList<ClientDto> GetAllClients() {
     62    public ResponseList<ClientDto> GetAllSlaves() {
    6763      using (contextFactory.GetContext(false)) {
    6864        secMan.Authorize("AccessClients", sessionID, Guid.Empty);
    69         return slaveManager.GetAllClients();
     65        return slaveManager.GetAllSlaves();
    7066      }
    7167    }
     
    140136    }
    141137
    142     public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
     138    //public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
     139    //  using (contextFactory.GetContext(false)) {
     140    //    secMan.Authorize("AccessJobResults", sessionID, jobId);
     141    //    return jobManager.GetLastJobResultOf(jobId);
     142    //  }
     143    //}
     144
     145    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
    143146      using (contextFactory.GetContext(false)) {
    144147        secMan.Authorize("AccessJobResults", sessionID, jobId);
    145         return jobManager.GetLastJobResultOf(jobId);
    146       }
    147     }
    148 
    149     public ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
    150       using (contextFactory.GetContext(false)) {
    151         secMan.Authorize("AccessJobResults", sessionID, jobId);
    152         return jobManager.GetLastSerializedJobResultOf(jobId, requested, snapshot);
    153       }
    154     }
    155 
    156     public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
     148        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
     149      }
     150    }
     151
     152    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
    157153      using (contextFactory.GetContext(false)) {
    158154        //secMan.Authorize("AccessJobResults", sessionID, jobId); skip authorization
    159         return jobManager.GetAllJobResults(jobIds);
    160       }
    161     }
    162 
    163     public Response RemoveJob(Guid jobId) {
    164       using (contextFactory.GetContext()) {
    165         secMan.Authorize("RemoveJob", sessionID, jobId);
    166         return jobManager.RemoveJob(jobId);
    167       }
    168     }
     155        return jobManager.GetJobResults(jobIds);
     156      }
     157    }
     158
     159    //public Response RemoveJob(Guid jobId) {
     160    //  using (contextFactory.GetContext()) {
     161    //    secMan.Authorize("RemoveJob", sessionID, jobId);
     162    //    return jobManager.RemoveJob(jobId);
     163    //  }
     164    //}
    169165
    170166    public Response RequestSnapshot(Guid jobId) {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

    r4254 r4263  
    3535using HeuristicLab.Hive.Server.LINQDataAccess;
    3636using HeuristicLab.Hive.Server.DataAccess;
     37using HeuristicLab.Hive.Contracts.ResponseObjects;
    3738
    3839namespace HeuristicLab.Hive.Server.Core {
     
    8586    }
    8687
    87     public ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList) {
    88       return slaveCommunicator.SendPlugins(pluginList);     
     88    public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
     89      return slaveCommunicator.GetPlugins(pluginList);     
    8990    }
    9091
     
    9495      }
    9596    }
    96 
    9797
    9898    public ResponseCalendar GetCalendar(Guid clientId) {
     
    114114    /// Do not use automatic transactions here
    115115    /// </summary>
    116     public Stream SendStreamedJob(Guid clientId) {
     116    public Stream GetStreamedJob(Guid clientId) {
    117117      using (contextFactory.GetContext(false)) {
    118118        MultiStream stream = new MultiStream();
     
    125125        stream.AddStream(new StreamedObject<ResponseObject<JobDto>>(job));
    126126
    127         IJobManager jobManager = ServiceLocator.GetJobManager();
    128         IInternalJobManager internalJobManager = (IInternalJobManager)jobManager;
     127        IInternalJobManager internalJobManager = (IInternalJobManager)ServiceLocator.GetJobManager();
    129128
    130129        //second stream the job binary data
    131130        MemoryStream memoryStream = new MemoryStream();
    132         if (job.Obj != null)
     131        if (job.Obj != null) {
    133132          stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Obj.Id)));
     133        }
    134134
    135135        OperationContext clientContext = OperationContext.Current;
     
    144144    }
    145145
    146     public Stream SendStreamedPlugins(List<HivePluginInfoDto> pluginList) {
    147       return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.SendPlugins(pluginList));
     146    public Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList) {
     147      return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.GetPlugins(pluginList));
    148148    }
    149149
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IInternalSlaveCommunicator.cs

    r4253 r4263  
    2727using HeuristicLab.Hive.Contracts;
    2828using System.IO;
     29using HeuristicLab.Hive.Contracts.ResponseObjects;
    2930
    3031namespace HeuristicLab.Hive.Server.Core.InternalInterfaces {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

    r4254 r4263  
    3838using HeuristicLab.Hive.Server.LINQDataAccess;
    3939using IsolationLevel = System.Transactions.IsolationLevel;
     40using HeuristicLab.Hive.Contracts.ResponseObjects;
    4041
    4142namespace HeuristicLab.Hive.Server.Core {
     
    5051      lifecycleManager.RegisterStartup(new EventHandler(lifecycleManager_OnStartup));
    5152      lifecycleManager.RegisterShutdown(new EventHandler(lifecycleManager_OnShutdown));
    52     }
    53 
    54     private JobDto GetLastJobResult(Guid jobId) {
    55       return DaoLocator.JobDao.FindById(jobId);
    5653    }
    5754
     
    8582    public ResponseList<JobDto> GetAllJobs() {
    8683      ResponseList<JobDto> response = new ResponseList<JobDto>();
    87 
    8884      response.List = new List<JobDto>(DaoLocator.JobDao.FindAll());
    89       response.Success = true;
    90       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
    91 
    9285      return response;
    9386    }
     
    9689      ResponseList<JobDto> response = new ResponseList<JobDto>();
    9790      response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
    98       response.Success = true;
    9991      return response;
    10092    }
     
    118110      response.Obj = DaoLocator.JobDao.FindById(jobId);
    119111      if (response.Obj != null) {
    120         response.Success = true;
    121         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
     112        response.StatusMessage = ResponseStatus.Ok;
    122113      } else {
    123         response.Success = false;
    124         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
     114        response.StatusMessage = ResponseStatus.GetJobById_JobDoesNotExist;
    125115      }
    126116
     
    135125      job.Obj = DaoLocator.JobDao.FindById(jobId);
    136126      if (job.Obj != null) {
    137         job.Success = true;
    138         job.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
     127        job.StatusMessage = ResponseStatus.Ok;
    139128
    140129        job.Obj.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
    141130      } else {
    142         job.Success = false;
    143         job.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
     131        job.StatusMessage = ResponseStatus.GetJobByIdWithDetails_JobDoesNotExist;
    144132      }
    145133      return job;
     
    166154      if (job != null && job.JobInfo != null) {
    167155        if (job.JobInfo.State != State.Offline) {
    168           response.Success = false;
    169           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
     156          response.StatusMessage = ResponseStatus.AddNewJob_JobStateMustBeOffline;
    170157          return response;
    171158        }
    172159        if (job.JobInfo.Id != Guid.Empty) {
    173           response.Success = false;
    174           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
     160          response.StatusMessage = ResponseStatus.AddNewJob_JobIdMustNotBeSet;
    175161          return response;
    176162        }
    177163        if (job.SerializedJobData == null) {
    178           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
    179           response.Success = false;
     164          response.StatusMessage = ResponseStatus.AddNewJob_JobNull;
    180165          return response;
    181166        }
     
    185170        DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
    186171
    187         response.Success = true;
    188172        response.Obj = job.JobInfo;
    189         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
    190173      } else {
    191         response.Success = false;
    192         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
     174        response.StatusMessage = ResponseStatus.AddNewJob_JobNull;
    193175      }
    194176
     
    198180    /// <summary>
    199181    /// Removes a job from the database
     182    ///
     183    /// [chn] this is currently not used anywhere -> check redundancy with AbortJob
    200184    /// </summary>
    201185    /// <param name="jobId"></param>
    202186    /// <returns></returns>
    203     public Response RemoveJob(Guid jobId) {
    204       Response response = new Response();
    205 
    206       JobDto job = DaoLocator.JobDao.FindById(jobId);
    207       if (job == null) {
    208         response.Success = false;
    209         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
    210         return response;
    211       }
    212       DaoLocator.JobDao.Delete(job);
    213       response.Success = false;
    214       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_REMOVED;
    215 
    216       return response;
    217     }
    218 
    219     public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
    220       ResponseObject<JobDto> result = new ResponseObject<JobDto>();
    221 
    222       result.Obj = GetLastJobResult(jobId);
    223       result.Success = result.Obj != null;
    224 
    225       return result;
    226     }
     187    //public Response RemoveJob(Guid jobId) {
     188    //  Response response = new Response();
     189
     190    //  JobDto job = DaoLocator.JobDao.FindById(jobId);
     191    //  if (job == null) {
     192    //    response.StatusMessage = ResponseStatusMessage.RemoveJob_JobDoesNotExist;
     193    //    return response;
     194    //  }
     195    //  DaoLocator.JobDao.Delete(job);
     196
     197    //  return response;
     198    //}
     199
     200    ///
     201    /// [chn] currently not used anywhere
     202    ///
     203    //public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
     204    //  ResponseObject<JobDto> result = new ResponseObject<JobDto>();
     205
     206    //  result.Obj = DaoLocator.JobDao.FindById(jobId);
     207    //  if (result.Obj == null) {
     208    //    result.StatusMessage = ResponseStatusMessage.
     209    //  }
     210
     211    //  return result;
     212    //}
    227213
    228214    // [chn] [refactor] why does this method handle 3 different cases? wouldn't 3 methods be easier?
     
    230216    // requested==true: resultat mit job
    231217    // requested==false:
    232     public ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
     218    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
    233219      ResponseObject<SerializedJob> response = new ResponseObject<SerializedJob>();
    234220
     
    237223      //if it's a snapshot but the result hasn't reached the server yet...
    238224      if (snapshot && (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
    239         response.Success = true;
    240         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
     225        response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
    241226
    242227        return response;
     
    245230      //if it's NOT a snapshot, NEITHER request NOR is it finished
    246231      if (!requested && !snapshot && job.State != State.Finished) {
    247         response.Success = true;
    248         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
     232        response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
    249233
    250234        return response;
     
    252236
    253237      //every other case - snapshot, job finished or it's requested
    254       response.Success = true;
    255       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
    256238      response.Obj = new SerializedJob();
    257239      response.Obj.JobInfo = job;
     
    267249      JobDto job = DaoLocator.JobDao.FindById(jobId);
    268250      if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
    269         response.Success = true;
    270         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
     251        response.StatusMessage = ResponseStatus.RequestSnapshot_SnapshotAlreadyRequested;
    271252        return response;
    272253      }
    273254      if (job.State != State.Calculating) {
    274         response.Success = false;
    275         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
     255        response.StatusMessage = ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated;
    276256        return response;
    277257      }
     
    280260      DaoLocator.JobDao.Update(job);
    281261
    282       response.Success = true;
    283       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_SET;
    284 
    285       return response;
    286     }
    287 
     262      return response;
     263    }
     264
     265    /// <summary>
     266    /// [chn] rename to RequestAbortJob?
     267    /// </summary>
    288268    public Response AbortJob(Guid jobId) {
    289269      Response response = new Response();
     
    291271      JobDto job = DaoLocator.JobDao.FindById(jobId);
    292272      if (job == null) {
    293         response.Success = false;
    294         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
     273        //response.Success = false;
     274        response.StatusMessage = ResponseStatus.AbortJob_JobDoesNotExist;
    295275        return response; // no commit needed
    296276      }
    297277      if (job.State == State.Abort) {
    298         response.Success = true;
    299         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
     278        //response.Success = true;
     279        response.StatusMessage = ResponseStatus.AbortJob_AbortAlreadyRequested;
    300280        return response; // no commit needed
    301281      }
    302282      if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
    303         response.Success = false;
    304         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
     283        //response.Success = false;
     284        response.StatusMessage = ResponseStatus.AbortJob_JobIsNotBeeingCalculated;
    305285        return response; // no commit needed
    306286      }
     
    309289      DaoLocator.JobDao.Update(job);
    310290
    311       response.Success = true;
    312       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_SET;
    313 
    314291      return response;
    315292    }
     
    320297    /// <param name="jobIds"></param>
    321298    /// <returns></returns>
    322     public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
     299    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
    323300      ResponseObject<JobResultList> response = new ResponseObject<JobResultList>();
    324301      JobResultList jobResultList = new JobResultList();
     
    335312      }
    336313      response.Obj = jobResultList;
    337       response.Success = true;
    338       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
    339314      return response;
    340315    }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

    r4254 r4263  
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Tracing;
     35using HeuristicLab.Hive.Contracts.ResponseObjects;
    3536
    3637namespace HeuristicLab.Hive.Server.Core {
     
    168169    /// A hearbeat entry is created as well (login is the first hearbeat)
    169170    /// </summary>
    170     /// <param name="clientInfo"></param>
     171    /// <param name="slaveInfo"></param>
    171172    /// <returns></returns>
    172     public Response Login(ClientDto clientInfo) {
     173    public Response Login(ClientDto slaveInfo) {
    173174      Response response = new Response();
    174175
    175176      heartbeatLock.EnterWriteLock();
    176       if (lastHeartbeats.ContainsKey(clientInfo.Id)) {
    177         lastHeartbeats[clientInfo.Id] = DateTime.Now;
     177      if (lastHeartbeats.ContainsKey(slaveInfo.Id)) {
     178        lastHeartbeats[slaveInfo.Id] = DateTime.Now;
    178179      } else {
    179         lastHeartbeats.Add(clientInfo.Id, DateTime.Now);
     180        lastHeartbeats.Add(slaveInfo.Id, DateTime.Now);
    180181      }
    181182      heartbeatLock.ExitWriteLock();
    182183
    183       ClientDto dbClient = DaoLocator.ClientDao.FindById(clientInfo.Id);
     184      ClientDto dbClient = DaoLocator.ClientDao.FindById(slaveInfo.Id);
    184185
    185186      //Really set offline?
    186187      //Reconnect issues with the currently calculating jobs
    187       clientInfo.State = State.Idle;
    188       clientInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
     188      slaveInfo.State = State.Idle;
     189      slaveInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
    189190
    190191      if (dbClient == null)
    191         DaoLocator.ClientDao.Insert(clientInfo);
     192        DaoLocator.ClientDao.Insert(slaveInfo);
    192193      else
    193         DaoLocator.ClientDao.Update(clientInfo);
    194       response.Success = true;
    195       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_SUCCESS;
     194        DaoLocator.ClientDao.Update(slaveInfo);
     195
    196196      return response;
    197197    }
     
    202202      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
    203203      if (client == null) {
    204         response.Success = false;
    205         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
     204        //response.Success = false;
     205        response.StatusMessage = ResponseStatus.GetCalendar_ResourceNotFound;
    206206        return response;
    207207      }
     
    211211      IEnumerable<AppointmentDto> appointments = DaoLocator.UptimeCalendarDao.GetCalendarForClient(client);
    212212      if (appointments.Count() == 0) {
    213         response.StatusMessage = ApplicationConstants.RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND;
    214         response.Success = false;
     213        response.StatusMessage = ResponseStatus.GetCalendar_NoCalendarFound;
     214        //response.Success = false;
    215215      } else {
    216         response.Success = true;
     216        //response.Success = true;
    217217        response.Appointments = appointments;
    218218      }
     
    227227      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
    228228      if (client == null) {
    229         response.Success = false;
    230         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
     229        //response.Success = false;
     230        response.StatusMessage = ResponseStatus.GetCalendar_ResourceNotFound;
    231231        return response;
    232232      }
     
    234234      client.CalendarSyncStatus = state;
    235235      DaoLocator.ClientDao.Update(client);
    236 
    237       response.Success = true;
    238       response.StatusMessage = ApplicationConstants.RESPONSE_UPTIMECALENDAR_STATUS_UPDATED;
    239236
    240237      return response;
     
    259256      // check if the client is logged in
    260257      if (client.State == State.Offline || client.State == State.NullState) {
    261         response.Success = false;
    262         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN;
     258        // response.Success = false;
     259        response.StatusMessage = ResponseStatus.ProcessHeartBeat_UserNotLoggedIn;
    263260        response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
    264261
     
    288285      //check if new Cal must be loaded
    289286      if (client.CalendarSyncStatus == CalendarState.Fetch || client.CalendarSyncStatus == CalendarState.ForceFetch) {
    290         response.Success = true;
    291         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR;
    292287        response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchOrForceFetchCalendar));
    293288
     
    306301      }
    307302      Logger.Debug(" END Looked for Client Jobs");
    308       response.Success = true;
    309       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED;
    310303
    311304      DaoLocator.ClientDao.Update(client);
     
    347340      if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {
    348341        if (jobsOfClient == null || jobsOfClient.Count == 0) {
    349           response.Success = false;
    350           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
     342          //response.Success = false;
     343          //response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
    351344
    352345          foreach (Guid jobId in hbData.JobProgress.Keys) {
     
    362355          curJob.Client = DaoLocator.ClientDao.GetClientForJob(curJob.Id);
    363356          if (curJob.Client == null || curJob.Client.Id != hbData.SlaveId) {
    364             response.Success = false;
    365             response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
     357            //response.Success = false;
     358            //response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
    366359            response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
    367360            Logger.Error("There is no job calculated by this user " + hbData.SlaveId + " Job: " + curJob);
     
    439432        response.Obj = job2Calculate;
    440433        response.Obj.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Obj);
    441         response.Success = true;
     434
    442435        Logger.Info("Job pulled: " + job2Calculate + " for user " + clientId);
    443         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
    444436        lock (newAssignedJobs) {
    445437          if (!newAssignedJobs.ContainsKey(job2Calculate.Id))
     
    447439        }
    448440      } else {
    449         response.Success = false;
     441        //response.Success = false;
    450442        response.Obj = null;
    451         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
     443        response.StatusMessage = ResponseStatus.GetJob_NoJobsAvailable;
    452444        Logger.Info("No more Jobs left for " + clientId);
    453445      }
     
    473465      ResponseResultReceived response = ProcessJobResult(result.ClientId, result.JobId, new byte[] { }, result.Percentage, result.Exception, finished);
    474466
    475       if (response.Success) {
     467      if (response.StatusMessage == ResponseStatus.Ok) {
    476468        Logger.Debug("Trying to aquire WCF Job Stream");
    477469        //jobStream = DaoLocator.JobDao.GetSerializedJobStream(result.JobId);
     
    500492    }
    501493
    502 
    503     private ResponseResultReceived ProcessJobResult(Guid clientId,
    504       Guid jobId,
    505       byte[] result,
    506       double? percentage,
    507       string exception,
    508       bool finished) {
    509 
     494    private ResponseResultReceived ProcessJobResult(Guid clientId, Guid jobId, byte[] result, double? percentage, string exception, bool finished) {
    510495      Logger.Info("BEGIN Job received for Storage - SUB method: " + jobId);
    511496
     
    521506        }
    522507      }
    523      
     508
    524509      if (job != null && job.JobInfo == null) {
    525         response.Success = false;
    526         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
     510        //response.Success = false;
     511        response.StatusMessage = ResponseStatus.ProcessJobResult_JobDoesNotExist;
    527512        response.JobId = jobId;
    528513        Logger.Error("No job with Id " + jobId);
     
    532517      }
    533518      if (job.JobInfo.State == State.Abort) {
    534         response.Success = false;
    535         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
     519        //response.Success = false;
     520        response.StatusMessage = ResponseStatus.ProcessJobResult_JobAborted;
    536521
    537522        Logger.Error("Job was aborted! " + job.JobInfo);
     
    541526      }
    542527      if (job.JobInfo.Client == null) {
    543         response.Success = false;
    544         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
     528        //response.Success = false;
     529        response.StatusMessage = ResponseStatus.ProcessJobResult_JobIsNotBeeingCalculated;
    545530        response.JobId = jobId;
    546531
     
    551536      }
    552537      if (job.JobInfo.Client.Id != clientId) {
    553         response.Success = false;
    554         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB;
     538        //response.Success = false;
     539        response.StatusMessage = ResponseStatus.ProcessJobResult_WrongClientForJob;
    555540        response.JobId = jobId;
    556541
     
    561546      }
    562547      if (job.JobInfo.State == State.Finished) {
    563         response.Success = true;
    564         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
     548        response.StatusMessage = ResponseStatus.Ok;
    565549        response.JobId = jobId;
    566550
     
    574558        job.JobInfo.State = State.Calculating;
    575559      }
    576       if (job.JobInfo.State != State.Calculating &&
    577         job.JobInfo.State != State.Pending) {
    578         response.Success = false;
    579         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
     560      if (job.JobInfo.State != State.Calculating && job.JobInfo.State != State.Pending) {
     561        //response.Success = false;
     562        response.StatusMessage = ResponseStatus.ProcessJobResult_InvalidJobState;
    580563        response.JobId = jobId;
    581564
     
    600583      DaoLocator.JobDao.Update(job.JobInfo);
    601584
    602       response.Success = true;
    603       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
     585      response.StatusMessage = ResponseStatus.Ok;
    604586      response.JobId = jobId;
    605587      response.Finished = finished;
     
    652634      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
    653635      if (client == null) {
    654         response.Success = false;
    655         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED;
     636        //response.Success = false;
     637        response.StatusMessage = ResponseStatus.Logout_SlaveNotRegistered;
    656638        return response;
    657639      }
     
    668650      DaoLocator.ClientDao.Update(client);
    669651
    670       response.Success = true;
    671       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS;
    672 
    673652      return response;
    674653    }
     
    684663      JobDto job = DaoLocator.JobDao.FindById(jobId);
    685664      if (job == null) {
    686         response.Success = false;
    687         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST;
     665        //response.Success = false;
     666        response.StatusMessage = ResponseStatus.IsJobStillNeeded_JobDoesNotExist;
    688667        Logger.Error("Job doesn't exist (anymore)! " + jobId);
    689668        return response;
    690669      }
    691670      if (job.State == State.Finished) {
    692         response.Success = true;
    693         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED;
     671        //response.Success = true;
     672        response.StatusMessage = ResponseStatus.IsJobStillNeeded_JobAlreadyFinished;
    694673        Logger.Error("already finished! " + job);
    695674        return response;
     
    702681      DaoLocator.JobDao.Update(job);
    703682
    704       response.Success = true;
    705       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT;
    706       return response;
    707     }
    708 
    709     public ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList) {
     683      return response;
     684    }
     685
     686    public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
    710687      ResponseList<CachedHivePluginInfoDto> response = new ResponseList<CachedHivePluginInfoDto>();
     688      response.List = new List<CachedHivePluginInfoDto>();
    711689      foreach (HivePluginInfoDto pluginInfo in pluginList) {
    712690        if (pluginInfo.Update) {
    713691          //check if there is a newer version         
    714           IPluginDescription ipd =
    715             ApplicationManager.Manager.Plugins.Where(pd => pd.Name == pluginInfo.Name && pd.Version.Major == pluginInfo.Version.Major && pd.Version.Minor == pluginInfo.Version.Minor && pd.Version.Revision > pluginInfo.Version.Revision).SingleOrDefault();
     692          IPluginDescription ipd = ApplicationManager.Manager.Plugins.Where(pd => pd.Name == pluginInfo.Name && pd.Version.Major == pluginInfo.Version.Major && pd.Version.Minor == pluginInfo.Version.Minor && pd.Version.Revision > pluginInfo.Version.Revision).SingleOrDefault();
    716693          if (ipd != null) {
    717             response.List.Add(convertPluginDescriptorToDto(ipd));
     694            response.List.Add(ConvertPluginDescriptorToDto(ipd));
    718695          }
    719696        } else {
    720           IPluginDescription ipd =
    721             ApplicationManager.Manager.Plugins.Where(pd => pd.Name == pluginInfo.Name && pd.Version.Major == pluginInfo.Version.Major && pd.Version.Minor == pluginInfo.Version.Minor && pd.Version.Revision >= pluginInfo.Version.Revision).SingleOrDefault();
     697          IPluginDescription ipd = ApplicationManager.Manager.Plugins.Where(pd => pd.Name == pluginInfo.Name && pd.Version.Major == pluginInfo.Version.Major && pd.Version.Minor == pluginInfo.Version.Minor && pd.Version.Revision >= pluginInfo.Version.Revision).SingleOrDefault();
    722698          if (ipd != null) {
    723             response.List.Add(convertPluginDescriptorToDto(ipd));
     699            response.List.Add(ConvertPluginDescriptorToDto(ipd));
    724700          } else {
    725             response.Success = false;
    726             response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL;
     701            //response.Success = false;
     702            response.StatusMessage = ResponseStatus.GetPlugins_PluginsNotAvailable;
    727703            return response;
    728704          }
    729705        }
    730706      }
    731       response.Success = true;
    732       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_PLUGINS_SENT;
    733 
    734       return response;
    735     }
    736 
    737     private CachedHivePluginInfoDto convertPluginDescriptorToDto(IPluginDescription currPlugin) {
     707      return response;
     708    }
     709
     710    private CachedHivePluginInfoDto ConvertPluginDescriptorToDto(IPluginDescription currPlugin) {
    738711      CachedHivePluginInfoDto currCachedPlugin = new CachedHivePluginInfoDto {
    739712        Name = currPlugin.Name,
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs

    r4253 r4263  
    3333using HeuristicLab.Hive.Server.LINQDataAccess;
    3434using ClientGroup=HeuristicLab.Hive.Contracts.BusinessObjects.ClientGroupDto;
     35using HeuristicLab.Hive.Contracts.ResponseObjects;
    3536
    3637namespace HeuristicLab.Hive.Server.Core {
     
    4849    /// </summary>
    4950    /// <returns></returns>
    50     public ResponseList<ClientDto> GetAllClients() {
     51    public ResponseList<ClientDto> GetAllSlaves() {
    5152      ResponseList<ClientDto> response = new ResponseList<ClientDto>();
    52 
    5353      response.List = new List<ClientDto>(DaoLocator.ClientDao.FindAll());
    54       response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTS;
    55       response.Success = true;
    56 
    5754      return response;
    5855    }
     
    6562      ResponseList<ClientGroup> response = new ResponseList<ClientGroup>();
    6663
    67       List<ClientGroup> allClientGroups =
    68         new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
     64      List<ClientGroup> allClientGroups = new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
    6965      ClientGroup emptyClientGroup = new ClientGroup();
    7066      IEnumerable<ClientDto> groupLessClients = DaoLocator.ClientDao.FindAllClientsWithoutGroup();
     
    7874
    7975      response.List = allClientGroups;
    80       response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS;
    81       response.Success = true;
    8276
    8377      return response;
    8478    }
    8579
     80    /// <summary>
     81    /// [chn] check usage
     82    /// </summary>
    8683    public ResponseList<UpTimeStatisticsDto> GetAllUpTimeStatistics() {
    87       ResponseList<UpTimeStatisticsDto> response = new ResponseList<UpTimeStatisticsDto>();
    88       response.Success = true;
    89       return response;
     84      return new ResponseList<UpTimeStatisticsDto>();
    9085    }
    9186
     
    9994
    10095      if (clientGroup.Id != Guid.Empty) {
    101         response.Success = false;
    102         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_ID_MUST_NOT_BE_SET;
     96        //response.Success = false;
     97        response.StatusMessage = ResponseStatus.AddClientGroup_SlaveIdMustNotBeSet;
    10398      }
    10499      else {
     
    106101        //clientGroupAdapter.Update(clientGroup);
    107102        response.Obj = clientGroup;
    108         response.Success = true;
    109         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_ADDED;
    110103      }
    111104
     
    124117      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
    125118      if (clientGroup == null) {
    126         response.Success = false;
    127         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
     119        //response.Success = false;
     120        response.StatusMessage = ResponseStatus.AddResourceToGroup_SlaveGroupDoesNotExist;
    128121        return response;
    129122      }
     
    138131        DaoLocator.ClientDao.SetServerSideCalendar(dbr, clientGroup.Id); 
    139132      }
    140 
    141       response.Success = true;
    142       response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP;
    143133
    144134      return response;
     
    156146      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
    157147      if (clientGroup == null) {
    158         response.Success = false;
    159         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
     148        // response.Success = false;
     149        response.StatusMessage = ResponseStatus.AddResourceToGroup_SlaveGroupDoesNotExist;
    160150        return response;
    161151      }
    162152     
    163153      DaoLocator.ClientGroupDao.RemoveRessourceFromClientGroup(resourceId, clientGroup.Id);
    164      
    165       response.Success = true;
    166       response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_REMOVED;
    167154      return response;               
    168155    }
     
    175162        ClientGroupDtoList groupsOfClient = new ClientGroupDtoList(DaoLocator.ClientGroupDao.MemberOf(client));
    176163        response.Obj = groupsOfClient;
    177         response.Success = true;
    178         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT;
    179       }
    180       else {
     164      } else {
    181165        response.Obj = new ClientGroupDtoList();
    182         response.Success = false;
    183         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
     166        //response.Success = false;
     167        response.StatusMessage = ResponseStatus.GetAllGroupsOfResource_ResourceNotFound;
    184168      }
    185169
     
    192176      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
    193177      if (clientGroup == null) {
    194         response.Success = false;
    195         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
     178        response.StatusMessage = ResponseStatus.DeleteClientGroup_SlaveGroupDoesNotExist;
    196179        return response;
    197180      }
    198181
    199182      DaoLocator.ClientGroupDao.Delete(clientGroup);
    200 
    201       response.Success = true;
    202       response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DELETED;
    203183      return response;
    204184    }
     
    207187      ResponseList<AppointmentDto> response = new ResponseList<AppointmentDto>();
    208188      response.List = new List<AppointmentDto>(DaoLocator.UptimeCalendarDao.GetUptimeCalendarForResource(guid));
    209       response.Success = true;
    210189      return response;
    211190    }
     
    214193      DaoLocator.UptimeCalendarDao.SetUptimeCalendarForResource(guid, appointments);
    215194      DaoLocator.UptimeCalendarDao.NotifyClientsOfNewCalendar(guid, isForced);
    216       return new Response {Success = true};
     195      return new Response();
    217196    }
    218197    #endregion
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

    r4254 r4263  
    125125    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.JobDto.datasource" />
    126126    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseHeartBeat.datasource" />
     127    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.Response.datasource" />
     128    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar.datasource" />
     129    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat.datasource" />
     130    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived.datasource" />
    127131    <None Include="Properties\DataSources\HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto.datasource" />
    128132    <None Include="Service References\ServerService\Arrays1.xsd">
     
    133137    </None>
    134138    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd">
     139      <SubType>Designer</SubType>
     140    </None>
     141    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.ResponseObjects.xsd">
    135142      <SubType>Designer</SubType>
    136143    </None>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd

    r4254 r4263  
    22<xs:schema xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:tns="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" xmlns:xs="http://www.w3.org/2001/XMLSchema">
    33  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
    4   <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
    5   <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" />
    6   <xs:complexType name="Response">
    7     <xs:sequence>
    8       <xs:element minOccurs="0" name="StatusMessage" nillable="true" type="xs:string" />
    9       <xs:element minOccurs="0" name="Success" type="xs:boolean" />
    10     </xs:sequence>
    11   </xs:complexType>
    12   <xs:element name="Response" nillable="true" type="tns:Response" />
    13   <xs:complexType name="ResponseHeartBeat">
    14     <xs:complexContent mixed="false">
    15       <xs:extension base="tns:Response">
    16         <xs:sequence>
    17           <xs:element minOccurs="0" name="ActionRequest" nillable="true" type="tns:ArrayOfMessageContainer" />
    18         </xs:sequence>
    19       </xs:extension>
    20     </xs:complexContent>
    21   </xs:complexType>
    22   <xs:element name="ResponseHeartBeat" nillable="true" type="tns:ResponseHeartBeat" />
     4  <xs:simpleType name="ResponseStatus">
     5    <xs:restriction base="xs:string">
     6      <xs:enumeration value="Ok" />
     7      <xs:enumeration value="RequestSnapshot_JobIsNotBeeingCalculated" />
     8      <xs:enumeration value="RequestSnapshot_SnapshotAlreadyRequested" />
     9      <xs:enumeration value="GetJobById_JobDoesNotExist" />
     10      <xs:enumeration value="GetJobByIdWithDetails_JobDoesNotExist" />
     11      <xs:enumeration value="AddNewJob_JobStateMustBeOffline" />
     12      <xs:enumeration value="AddNewJob_JobIdMustNotBeSet" />
     13      <xs:enumeration value="AddNewJob_JobNull" />
     14      <xs:enumeration value="RemoveJob_JobDoesNotExist" />
     15      <xs:enumeration value="GetLastSerializedResult_JobResultNotYetThere" />
     16      <xs:enumeration value="AbortJob_JobDoesNotExist" />
     17      <xs:enumeration value="AbortJob_AbortAlreadyRequested" />
     18      <xs:enumeration value="AbortJob_JobIsNotBeeingCalculated" />
     19      <xs:enumeration value="GetCalendar_ResourceNotFound" />
     20      <xs:enumeration value="GetCalendar_NoCalendarFound" />
     21      <xs:enumeration value="SetCalendarStatus_ResourceNotFound" />
     22      <xs:enumeration value="ProcessHeartBeat_UserNotLoggedIn" />
     23      <xs:enumeration value="GetJob_NoJobsAvailable" />
     24      <xs:enumeration value="ProcessJobResult_JobDoesNotExist" />
     25      <xs:enumeration value="ProcessJobResult_JobAborted" />
     26      <xs:enumeration value="ProcessJobResult_JobIsNotBeeingCalculated" />
     27      <xs:enumeration value="ProcessJobResult_WrongClientForJob" />
     28      <xs:enumeration value="ProcessJobResult_InvalidJobState" />
     29      <xs:enumeration value="Login_LoginFaild" />
     30      <xs:enumeration value="Logout_SlaveNotRegistered" />
     31      <xs:enumeration value="IsJobStillNeeded_JobDoesNotExist" />
     32      <xs:enumeration value="IsJobStillNeeded_JobAlreadyFinished" />
     33      <xs:enumeration value="GetPlugins_PluginsNotAvailable" />
     34      <xs:enumeration value="AddClientGroup_SlaveIdMustNotBeSet" />
     35      <xs:enumeration value="AddResourceToGroup_SlaveGroupDoesNotExist" />
     36      <xs:enumeration value="DeleteResourceFromGroup_SlaveGroupDoesNotExist" />
     37      <xs:enumeration value="GetAllGroupsOfResource_ResourceNotFound" />
     38      <xs:enumeration value="DeleteClientGroup_SlaveGroupDoesNotExist" />
     39    </xs:restriction>
     40  </xs:simpleType>
     41  <xs:element name="ResponseStatus" nillable="true" type="tns:ResponseStatus" />
    2342  <xs:complexType name="ArrayOfMessageContainer">
    2443    <xs:sequence>
     
    5069  </xs:simpleType>
    5170  <xs:element name="MessageContainer.MessageType" nillable="true" type="tns:MessageContainer.MessageType" />
    52   <xs:complexType name="ResponseObjectOfJobDtoZAa7YIsz">
    53     <xs:annotation>
    54       <xs:appinfo>
    55         <GenericType Name="ResponseObjectOf{0}{#}" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
    56           <GenericParameter Name="JobDto" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects">
    57           </GenericParameter>
    58         </GenericType>
    59       </xs:appinfo>
    60     </xs:annotation>
    61     <xs:complexContent mixed="false">
    62       <xs:extension base="tns:Response">
    63         <xs:sequence>
    64           <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="Obj" nillable="true" type="q1:JobDto" />
    65         </xs:sequence>
    66       </xs:extension>
    67     </xs:complexContent>
    68   </xs:complexType>
    69   <xs:element name="ResponseObjectOfJobDtoZAa7YIsz" nillable="true" type="tns:ResponseObjectOfJobDtoZAa7YIsz" />
    70   <xs:complexType name="ResponseResultReceived">
    71     <xs:complexContent mixed="false">
    72       <xs:extension base="tns:Response">
    73         <xs:sequence>
    74           <xs:element minOccurs="0" name="Finished" type="xs:boolean" />
    75           <xs:element minOccurs="0" name="JobId" type="ser:guid" />
    76         </xs:sequence>
    77       </xs:extension>
    78     </xs:complexContent>
    79   </xs:complexType>
    80   <xs:element name="ResponseResultReceived" nillable="true" type="tns:ResponseResultReceived" />
    81   <xs:complexType name="ResponseListOfCachedHivePluginInfoDtoZMwZop09">
    82     <xs:annotation>
    83       <xs:appinfo>
    84         <GenericType Name="ResponseListOf{0}{#}" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
    85           <GenericParameter Name="CachedHivePluginInfoDto" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure">
    86           </GenericParameter>
    87         </GenericType>
    88       </xs:appinfo>
    89     </xs:annotation>
    90     <xs:complexContent mixed="false">
    91       <xs:extension base="tns:Response">
    92         <xs:sequence>
    93           <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="List" nillable="true" type="q2:ArrayOfCachedHivePluginInfoDto" />
    94         </xs:sequence>
    95       </xs:extension>
    96     </xs:complexContent>
    97   </xs:complexType>
    98   <xs:element name="ResponseListOfCachedHivePluginInfoDtoZMwZop09" nillable="true" type="tns:ResponseListOfCachedHivePluginInfoDtoZMwZop09" />
    99   <xs:complexType name="ResponseCalendar">
    100     <xs:complexContent mixed="false">
    101       <xs:extension base="tns:Response">
    102         <xs:sequence>
    103           <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="Appointments" nillable="true" type="q3:ArrayOfAppointmentDto" />
    104           <xs:element minOccurs="0" name="ForceFetch" type="xs:boolean" />
    105         </xs:sequence>
    106       </xs:extension>
    107     </xs:complexContent>
    108   </xs:complexType>
    109   <xs:element name="ResponseCalendar" nillable="true" type="tns:ResponseCalendar" />
    11071</xs:schema>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.cs

    r4254 r4263  
    1717       
    1818        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/Login", ReplyAction="http://tempuri.org/ISlaveCommunicator/LoginResponse")]
    19         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
    20         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
    21         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    22         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
    23         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
    24         HeuristicLab.Hive.Contracts.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo);
     19        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
     20        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
     21        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
     22        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
     23        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
     24        HeuristicLab.Hive.Contracts.ResponseObjects.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo);
    2525       
    2626        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/Login", ReplyAction="http://tempuri.org/ISlaveCommunicator/LoginResponse")]
    2727        System.IAsyncResult BeginLogin(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo, System.AsyncCallback callback, object asyncState);
    2828       
    29         HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result);
     29        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogin(System.IAsyncResult result);
    3030       
    3131        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeatResponse")]
    32         HeuristicLab.Hive.Contracts.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
     32        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
    3333       
    3434        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeatResponse")]
    3535        System.IAsyncResult BeginProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
    3636       
    37         HeuristicLab.Hive.Contracts.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result);
     37        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result);
    3838       
    3939        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/GetJob", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetJobResponse")]
    40         HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId);
     40        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId);
    4141       
    4242        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/GetJob", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetJobResponse")]
    4343        System.IAsyncResult BeginGetJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
    4444       
    45         HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result);
     45        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result);
    4646       
    4747        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResult", ReplyAction="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResultResponse")]
    48         HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
     48        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
    4949       
    5050        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResult", ReplyAction="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResultResponse")]
    5151        System.IAsyncResult BeginStoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception, System.AsyncCallback callback, object asyncState);
    5252       
    53         HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result);
     53        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result);
    5454       
    5555        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/ProcessSnapshot", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessSnapshotResponse")]
    56         HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
     56        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
    5757       
    5858        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/ProcessSnapshot", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessSnapshotResponse")]
    5959        System.IAsyncResult BeginProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception, System.AsyncCallback callback, object asyncState);
    6060       
    61         HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result);
     61        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result);
    6262       
    6363        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/Logout", ReplyAction="http://tempuri.org/ISlaveCommunicator/LogoutResponse")]
    64         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
    65         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
    66         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    67         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
    68         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
    69         HeuristicLab.Hive.Contracts.Response Logout(System.Guid clientId);
     64        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
     65        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
     66        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
     67        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
     68        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
     69        HeuristicLab.Hive.Contracts.ResponseObjects.Response Logout(System.Guid clientId);
    7070       
    7171        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/Logout", ReplyAction="http://tempuri.org/ISlaveCommunicator/LogoutResponse")]
    7272        System.IAsyncResult BeginLogout(System.Guid clientId, System.AsyncCallback callback, object asyncState);
    7373       
    74         HeuristicLab.Hive.Contracts.Response EndLogout(System.IAsyncResult result);
     74        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogout(System.IAsyncResult result);
    7575       
    7676        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/IsJobStillNeeded", ReplyAction="http://tempuri.org/ISlaveCommunicator/IsJobStillNeededResponse")]
    77         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
    78         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
    79         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    80         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
    81         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
    82         HeuristicLab.Hive.Contracts.Response IsJobStillNeeded(System.Guid jobId);
     77        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
     78        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
     79        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
     80        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
     81        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
     82        HeuristicLab.Hive.Contracts.ResponseObjects.Response IsJobStillNeeded(System.Guid jobId);
    8383       
    8484        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/IsJobStillNeeded", ReplyAction="http://tempuri.org/ISlaveCommunicator/IsJobStillNeededResponse")]
    8585        System.IAsyncResult BeginIsJobStillNeeded(System.Guid jobId, System.AsyncCallback callback, object asyncState);
    8686       
    87         HeuristicLab.Hive.Contracts.Response EndIsJobStillNeeded(System.IAsyncResult result);
    88        
    89         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/SendPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/SendPluginsResponse")]
    90         HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> SendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
    91        
    92         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/SendPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/SendPluginsResponse")]
    93         System.IAsyncResult BeginSendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
    94        
    95         HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndSendPlugins(System.IAsyncResult result);
     87        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndIsJobStillNeeded(System.IAsyncResult result);
     88       
     89        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/GetPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetPluginsResponse")]
     90        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> GetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
     91       
     92        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/GetPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetPluginsResponse")]
     93        System.IAsyncResult BeginGetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
     94       
     95        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndGetPlugins(System.IAsyncResult result);
    9696       
    9797        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/GetCalendar", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetCalendarResponse")]
    98         HeuristicLab.Hive.Contracts.ResponseCalendar GetCalendar(System.Guid clientId);
     98        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar GetCalendar(System.Guid clientId);
    9999       
    100100        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/GetCalendar", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetCalendarResponse")]
    101101        System.IAsyncResult BeginGetCalendar(System.Guid clientId, System.AsyncCallback callback, object asyncState);
    102102       
    103         HeuristicLab.Hive.Contracts.ResponseCalendar EndGetCalendar(System.IAsyncResult result);
     103        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar EndGetCalendar(System.IAsyncResult result);
    104104       
    105105        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/SetCalendarStatus", ReplyAction="http://tempuri.org/ISlaveCommunicator/SetCalendarStatusResponse")]
    106         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
    107         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
    108         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
    109         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
    110         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
    111         HeuristicLab.Hive.Contracts.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state);
     106        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
     107        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
     108        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
     109        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
     110        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
     111        HeuristicLab.Hive.Contracts.ResponseObjects.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state);
    112112       
    113113        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/SetCalendarStatus", ReplyAction="http://tempuri.org/ISlaveCommunicator/SetCalendarStatusResponse")]
    114114        System.IAsyncResult BeginSetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state, System.AsyncCallback callback, object asyncState);
    115115       
    116         HeuristicLab.Hive.Contracts.Response EndSetCalendarStatus(System.IAsyncResult result);
    117        
    118         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/SendStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedJobResponse")]
    119         System.IO.Stream SendStreamedJob(System.Guid clientId);
    120        
    121         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/SendStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedJobResponse")]
    122         System.IAsyncResult BeginSendStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
    123        
    124         System.IO.Stream EndSendStreamedJob(System.IAsyncResult result);
    125        
    126         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/SendStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedPluginsResponse")]
    127         System.IO.Stream SendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
    128        
    129         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/SendStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedPluginsResponse")]
    130         System.IAsyncResult BeginSendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
    131        
    132         System.IO.Stream EndSendStreamedPlugins(System.IAsyncResult result);
     116        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndSetCalendarStatus(System.IAsyncResult result);
     117       
     118        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/GetStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedJobResponse")]
     119        System.IO.Stream GetStreamedJob(System.Guid clientId);
     120       
     121        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/GetStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedJobResponse")]
     122        System.IAsyncResult BeginGetStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
     123       
     124        System.IO.Stream EndGetStreamedJob(System.IAsyncResult result);
     125       
     126        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/GetStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedPluginsResponse")]
     127        System.IO.Stream GetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
     128       
     129        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/GetStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedPluginsResponse")]
     130        System.IAsyncResult BeginGetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
     131       
     132        System.IO.Stream EndGetStreamedPlugins(System.IAsyncResult result);
    133133       
    134134        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamedResponse")]
    135         HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream);
     135        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream);
    136136       
    137137        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamedResponse")]
    138138        System.IAsyncResult BeginStoreFinishedJobResultStreamed(System.IO.Stream stream, System.AsyncCallback callback, object asyncState);
    139139       
    140         HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result);
     140        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result);
    141141       
    142142        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamedResponse")]
    143         HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream);
     143        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream);
    144144       
    145145        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamedResponse")]
    146146        System.IAsyncResult BeginProcessSnapshotStreamed(System.IO.Stream stream, System.AsyncCallback callback, object asyncState);
    147147       
    148         HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result);
     148        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result);
    149149    }
    150150   
     
    164164        }
    165165       
    166         public HeuristicLab.Hive.Contracts.Response Result {
    167             get {
    168                 base.RaiseExceptionIfNecessary();
    169                 return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
     166        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
     167            get {
     168                base.RaiseExceptionIfNecessary();
     169                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
    170170            }
    171171        }
     
    183183        }
    184184       
    185         public HeuristicLab.Hive.Contracts.ResponseHeartBeat Result {
    186             get {
    187                 base.RaiseExceptionIfNecessary();
    188                 return ((HeuristicLab.Hive.Contracts.ResponseHeartBeat)(this.results[0]));
     185        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat Result {
     186            get {
     187                base.RaiseExceptionIfNecessary();
     188                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat)(this.results[0]));
    189189            }
    190190        }
     
    202202        }
    203203       
    204         public HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> Result {
    205             get {
    206                 base.RaiseExceptionIfNecessary();
    207                 return ((HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>)(this.results[0]));
     204        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> Result {
     205            get {
     206                base.RaiseExceptionIfNecessary();
     207                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>)(this.results[0]));
    208208            }
    209209        }
     
    221221        }
    222222       
    223         public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
    224             get {
    225                 base.RaiseExceptionIfNecessary();
    226                 return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
     223        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
     224            get {
     225                base.RaiseExceptionIfNecessary();
     226                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
    227227            }
    228228        }
     
    240240        }
    241241       
    242         public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
    243             get {
    244                 base.RaiseExceptionIfNecessary();
    245                 return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
     242        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
     243            get {
     244                base.RaiseExceptionIfNecessary();
     245                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
    246246            }
    247247        }
     
    259259        }
    260260       
    261         public HeuristicLab.Hive.Contracts.Response Result {
    262             get {
    263                 base.RaiseExceptionIfNecessary();
    264                 return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
     261        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
     262            get {
     263                base.RaiseExceptionIfNecessary();
     264                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
    265265            }
    266266        }
     
    278278        }
    279279       
    280         public HeuristicLab.Hive.Contracts.Response Result {
    281             get {
    282                 base.RaiseExceptionIfNecessary();
    283                 return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
    284             }
    285         }
    286     }
    287    
    288     [System.Diagnostics.DebuggerStepThroughAttribute()]
    289     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    290     public partial class SendPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    291        
    292         private object[] results;
    293        
    294         public SendPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
    295                 base(exception, cancelled, userState) {
    296             this.results = results;
    297         }
    298        
    299         public HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> Result {
    300             get {
    301                 base.RaiseExceptionIfNecessary();
    302                 return ((HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>)(this.results[0]));
     280        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
     281            get {
     282                base.RaiseExceptionIfNecessary();
     283                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
     284            }
     285        }
     286    }
     287   
     288    [System.Diagnostics.DebuggerStepThroughAttribute()]
     289    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     290    public partial class GetPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     291       
     292        private object[] results;
     293       
     294        public GetPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     295                base(exception, cancelled, userState) {
     296            this.results = results;
     297        }
     298       
     299        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> Result {
     300            get {
     301                base.RaiseExceptionIfNecessary();
     302                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>)(this.results[0]));
    303303            }
    304304        }
     
    316316        }
    317317       
    318         public HeuristicLab.Hive.Contracts.ResponseCalendar Result {
    319             get {
    320                 base.RaiseExceptionIfNecessary();
    321                 return ((HeuristicLab.Hive.Contracts.ResponseCalendar)(this.results[0]));
     318        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar Result {
     319            get {
     320                base.RaiseExceptionIfNecessary();
     321                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar)(this.results[0]));
    322322            }
    323323        }
     
    335335        }
    336336       
    337         public HeuristicLab.Hive.Contracts.Response Result {
    338             get {
    339                 base.RaiseExceptionIfNecessary();
    340                 return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
    341             }
    342         }
    343     }
    344    
    345     [System.Diagnostics.DebuggerStepThroughAttribute()]
    346     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    347     public partial class SendStreamedJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    348        
    349         private object[] results;
    350        
    351         public SendStreamedJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     337        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
     338            get {
     339                base.RaiseExceptionIfNecessary();
     340                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
     341            }
     342        }
     343    }
     344   
     345    [System.Diagnostics.DebuggerStepThroughAttribute()]
     346    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     347    public partial class GetStreamedJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     348       
     349        private object[] results;
     350       
     351        public GetStreamedJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
    352352                base(exception, cancelled, userState) {
    353353            this.results = results;
     
    364364    [System.Diagnostics.DebuggerStepThroughAttribute()]
    365365    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    366     public partial class SendStreamedPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    367        
    368         private object[] results;
    369        
    370         public SendStreamedPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     366    public partial class GetStreamedPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     367       
     368        private object[] results;
     369       
     370        public GetStreamedPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
    371371                base(exception, cancelled, userState) {
    372372            this.results = results;
     
    392392        }
    393393       
    394         public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
    395             get {
    396                 base.RaiseExceptionIfNecessary();
    397                 return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
     394        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
     395            get {
     396                base.RaiseExceptionIfNecessary();
     397                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
    398398            }
    399399        }
     
    411411        }
    412412       
    413         public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
    414             get {
    415                 base.RaiseExceptionIfNecessary();
    416                 return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
     413        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
     414            get {
     415                base.RaiseExceptionIfNecessary();
     416                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
    417417            }
    418418        }
     
    465465        private System.Threading.SendOrPostCallback onIsJobStillNeededCompletedDelegate;
    466466       
    467         private BeginOperationDelegate onBeginSendPluginsDelegate;
    468        
    469         private EndOperationDelegate onEndSendPluginsDelegate;
    470        
    471         private System.Threading.SendOrPostCallback onSendPluginsCompletedDelegate;
     467        private BeginOperationDelegate onBeginGetPluginsDelegate;
     468       
     469        private EndOperationDelegate onEndGetPluginsDelegate;
     470       
     471        private System.Threading.SendOrPostCallback onGetPluginsCompletedDelegate;
    472472       
    473473        private BeginOperationDelegate onBeginGetCalendarDelegate;
     
    483483        private System.Threading.SendOrPostCallback onSetCalendarStatusCompletedDelegate;
    484484       
    485         private BeginOperationDelegate onBeginSendStreamedJobDelegate;
    486        
    487         private EndOperationDelegate onEndSendStreamedJobDelegate;
    488        
    489         private System.Threading.SendOrPostCallback onSendStreamedJobCompletedDelegate;
    490        
    491         private BeginOperationDelegate onBeginSendStreamedPluginsDelegate;
    492        
    493         private EndOperationDelegate onEndSendStreamedPluginsDelegate;
    494        
    495         private System.Threading.SendOrPostCallback onSendStreamedPluginsCompletedDelegate;
     485        private BeginOperationDelegate onBeginGetStreamedJobDelegate;
     486       
     487        private EndOperationDelegate onEndGetStreamedJobDelegate;
     488       
     489        private System.Threading.SendOrPostCallback onGetStreamedJobCompletedDelegate;
     490       
     491        private BeginOperationDelegate onBeginGetStreamedPluginsDelegate;
     492       
     493        private EndOperationDelegate onEndGetStreamedPluginsDelegate;
     494       
     495        private System.Threading.SendOrPostCallback onGetStreamedPluginsCompletedDelegate;
    496496       
    497497        private BeginOperationDelegate onBeginStoreFinishedJobResultStreamedDelegate;
     
    540540        public event System.EventHandler<IsJobStillNeededCompletedEventArgs> IsJobStillNeededCompleted;
    541541       
    542         public event System.EventHandler<SendPluginsCompletedEventArgs> SendPluginsCompleted;
     542        public event System.EventHandler<GetPluginsCompletedEventArgs> GetPluginsCompleted;
    543543       
    544544        public event System.EventHandler<GetCalendarCompletedEventArgs> GetCalendarCompleted;
     
    546546        public event System.EventHandler<SetCalendarStatusCompletedEventArgs> SetCalendarStatusCompleted;
    547547       
    548         public event System.EventHandler<SendStreamedJobCompletedEventArgs> SendStreamedJobCompleted;
    549        
    550         public event System.EventHandler<SendStreamedPluginsCompletedEventArgs> SendStreamedPluginsCompleted;
     548        public event System.EventHandler<GetStreamedJobCompletedEventArgs> GetStreamedJobCompleted;
     549       
     550        public event System.EventHandler<GetStreamedPluginsCompletedEventArgs> GetStreamedPluginsCompleted;
    551551       
    552552        public event System.EventHandler<StoreFinishedJobResultStreamedCompletedEventArgs> StoreFinishedJobResultStreamedCompleted;
     
    554554        public event System.EventHandler<ProcessSnapshotStreamedCompletedEventArgs> ProcessSnapshotStreamedCompleted;
    555555       
    556         public HeuristicLab.Hive.Contracts.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo) {
     556        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo) {
    557557            return base.Channel.Login(clientInfo);
    558558        }
     
    564564       
    565565        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    566         public HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result) {
     566        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogin(System.IAsyncResult result) {
    567567            return base.Channel.EndLogin(result);
    568568        }
     
    574574       
    575575        private object[] OnEndLogin(System.IAsyncResult result) {
    576             HeuristicLab.Hive.Contracts.Response retVal = this.EndLogin(result);
     576            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndLogin(result);
    577577            return new object[] {
    578578                    retVal};
     
    604604        }
    605605       
    606         public HeuristicLab.Hive.Contracts.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
     606        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
    607607            return base.Channel.ProcessHeartBeat(hbData);
    608608        }
     
    614614       
    615615        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    616         public HeuristicLab.Hive.Contracts.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result) {
     616        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result) {
    617617            return base.Channel.EndProcessHeartBeat(result);
    618618        }
     
    624624       
    625625        private object[] OnEndProcessHeartBeat(System.IAsyncResult result) {
    626             HeuristicLab.Hive.Contracts.ResponseHeartBeat retVal = this.EndProcessHeartBeat(result);
     626            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat retVal = this.EndProcessHeartBeat(result);
    627627            return new object[] {
    628628                    retVal};
     
    654654        }
    655655       
    656         public HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId) {
     656        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId) {
    657657            return base.Channel.GetJob(clientId);
    658658        }
     
    664664       
    665665        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    666         public HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result) {
     666        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result) {
    667667            return base.Channel.EndGetJob(result);
    668668        }
     
    674674       
    675675        private object[] OnEndGetJob(System.IAsyncResult result) {
    676             HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> retVal = this.EndGetJob(result);
     676            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> retVal = this.EndGetJob(result);
    677677            return new object[] {
    678678                    retVal};
     
    704704        }
    705705       
    706         public HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
     706        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
    707707            return base.Channel.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);
    708708        }
     
    714714       
    715715        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    716         public HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result) {
     716        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result) {
    717717            return base.Channel.EndStoreFinishedJobResult(result);
    718718        }
     
    728728       
    729729        private object[] OnEndStoreFinishedJobResult(System.IAsyncResult result) {
    730             HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndStoreFinishedJobResult(result);
     730            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndStoreFinishedJobResult(result);
    731731            return new object[] {
    732732                    retVal};
     
    762762        }
    763763       
    764         public HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
     764        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
    765765            return base.Channel.ProcessSnapshot(clientId, jobId, result, percentage, exception);
    766766        }
     
    772772       
    773773        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    774         public HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result) {
     774        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result) {
    775775            return base.Channel.EndProcessSnapshot(result);
    776776        }
     
    786786       
    787787        private object[] OnEndProcessSnapshot(System.IAsyncResult result) {
    788             HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndProcessSnapshot(result);
     788            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndProcessSnapshot(result);
    789789            return new object[] {
    790790                    retVal};
     
    820820        }
    821821       
    822         public HeuristicLab.Hive.Contracts.Response Logout(System.Guid clientId) {
     822        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Logout(System.Guid clientId) {
    823823            return base.Channel.Logout(clientId);
    824824        }
     
    830830       
    831831        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    832         public HeuristicLab.Hive.Contracts.Response EndLogout(System.IAsyncResult result) {
     832        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogout(System.IAsyncResult result) {
    833833            return base.Channel.EndLogout(result);
    834834        }
     
    840840       
    841841        private object[] OnEndLogout(System.IAsyncResult result) {
    842             HeuristicLab.Hive.Contracts.Response retVal = this.EndLogout(result);
     842            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndLogout(result);
    843843            return new object[] {
    844844                    retVal};
     
    870870        }
    871871       
    872         public HeuristicLab.Hive.Contracts.Response IsJobStillNeeded(System.Guid jobId) {
     872        public HeuristicLab.Hive.Contracts.ResponseObjects.Response IsJobStillNeeded(System.Guid jobId) {
    873873            return base.Channel.IsJobStillNeeded(jobId);
    874874        }
     
    880880       
    881881        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    882         public HeuristicLab.Hive.Contracts.Response EndIsJobStillNeeded(System.IAsyncResult result) {
     882        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndIsJobStillNeeded(System.IAsyncResult result) {
    883883            return base.Channel.EndIsJobStillNeeded(result);
    884884        }
     
    890890       
    891891        private object[] OnEndIsJobStillNeeded(System.IAsyncResult result) {
    892             HeuristicLab.Hive.Contracts.Response retVal = this.EndIsJobStillNeeded(result);
     892            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndIsJobStillNeeded(result);
    893893            return new object[] {
    894894                    retVal};
     
    920920        }
    921921       
    922         public HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> SendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
    923             return base.Channel.SendPlugins(pluginList);
    924         }
    925        
    926         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    927         public System.IAsyncResult BeginSendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
    928             return base.Channel.BeginSendPlugins(pluginList, callback, asyncState);
    929         }
    930        
    931         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    932         public HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndSendPlugins(System.IAsyncResult result) {
    933             return base.Channel.EndSendPlugins(result);
    934         }
    935        
    936         private System.IAsyncResult OnBeginSendPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
     922        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> GetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
     923            return base.Channel.GetPlugins(pluginList);
     924        }
     925       
     926        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     927        public System.IAsyncResult BeginGetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
     928            return base.Channel.BeginGetPlugins(pluginList, callback, asyncState);
     929        }
     930       
     931        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     932        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndGetPlugins(System.IAsyncResult result) {
     933            return base.Channel.EndGetPlugins(result);
     934        }
     935       
     936        private System.IAsyncResult OnBeginGetPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
    937937            HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList = ((HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[])(inValues[0]));
    938             return this.BeginSendPlugins(pluginList, callback, asyncState);
    939         }
    940        
    941         private object[] OnEndSendPlugins(System.IAsyncResult result) {
    942             HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> retVal = this.EndSendPlugins(result);
    943             return new object[] {
    944                     retVal};
    945         }
    946        
    947         private void OnSendPluginsCompleted(object state) {
    948             if ((this.SendPluginsCompleted != null)) {
    949                 InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
    950                 this.SendPluginsCompleted(this, new SendPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
    951             }
    952         }
    953        
    954         public void SendPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
    955             this.SendPluginsAsync(pluginList, null);
    956         }
    957        
    958         public void SendPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
    959             if ((this.onBeginSendPluginsDelegate == null)) {
    960                 this.onBeginSendPluginsDelegate = new BeginOperationDelegate(this.OnBeginSendPlugins);
    961             }
    962             if ((this.onEndSendPluginsDelegate == null)) {
    963                 this.onEndSendPluginsDelegate = new EndOperationDelegate(this.OnEndSendPlugins);
    964             }
    965             if ((this.onSendPluginsCompletedDelegate == null)) {
    966                 this.onSendPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendPluginsCompleted);
    967             }
    968             base.InvokeAsync(this.onBeginSendPluginsDelegate, new object[] {
    969                         pluginList}, this.onEndSendPluginsDelegate, this.onSendPluginsCompletedDelegate, userState);
    970         }
    971        
    972         public HeuristicLab.Hive.Contracts.ResponseCalendar GetCalendar(System.Guid clientId) {
     938            return this.BeginGetPlugins(pluginList, callback, asyncState);
     939        }
     940       
     941        private object[] OnEndGetPlugins(System.IAsyncResult result) {
     942            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> retVal = this.EndGetPlugins(result);
     943            return new object[] {
     944                    retVal};
     945        }
     946       
     947        private void OnGetPluginsCompleted(object state) {
     948            if ((this.GetPluginsCompleted != null)) {
     949                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
     950                this.GetPluginsCompleted(this, new GetPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     951            }
     952        }
     953       
     954        public void GetPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
     955            this.GetPluginsAsync(pluginList, null);
     956        }
     957       
     958        public void GetPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
     959            if ((this.onBeginGetPluginsDelegate == null)) {
     960                this.onBeginGetPluginsDelegate = new BeginOperationDelegate(this.OnBeginGetPlugins);
     961            }
     962            if ((this.onEndGetPluginsDelegate == null)) {
     963                this.onEndGetPluginsDelegate = new EndOperationDelegate(this.OnEndGetPlugins);
     964            }
     965            if ((this.onGetPluginsCompletedDelegate == null)) {
     966                this.onGetPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetPluginsCompleted);
     967            }
     968            base.InvokeAsync(this.onBeginGetPluginsDelegate, new object[] {
     969                        pluginList}, this.onEndGetPluginsDelegate, this.onGetPluginsCompletedDelegate, userState);
     970        }
     971       
     972        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar GetCalendar(System.Guid clientId) {
    973973            return base.Channel.GetCalendar(clientId);
    974974        }
     
    980980       
    981981        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    982         public HeuristicLab.Hive.Contracts.ResponseCalendar EndGetCalendar(System.IAsyncResult result) {
     982        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar EndGetCalendar(System.IAsyncResult result) {
    983983            return base.Channel.EndGetCalendar(result);
    984984        }
     
    990990       
    991991        private object[] OnEndGetCalendar(System.IAsyncResult result) {
    992             HeuristicLab.Hive.Contracts.ResponseCalendar retVal = this.EndGetCalendar(result);
     992            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar retVal = this.EndGetCalendar(result);
    993993            return new object[] {
    994994                    retVal};
     
    10201020        }
    10211021       
    1022         public HeuristicLab.Hive.Contracts.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state) {
     1022        public HeuristicLab.Hive.Contracts.ResponseObjects.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state) {
    10231023            return base.Channel.SetCalendarStatus(clientId, state);
    10241024        }
     
    10301030       
    10311031        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1032         public HeuristicLab.Hive.Contracts.Response EndSetCalendarStatus(System.IAsyncResult result) {
     1032        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndSetCalendarStatus(System.IAsyncResult result) {
    10331033            return base.Channel.EndSetCalendarStatus(result);
    10341034        }
     
    10411041       
    10421042        private object[] OnEndSetCalendarStatus(System.IAsyncResult result) {
    1043             HeuristicLab.Hive.Contracts.Response retVal = this.EndSetCalendarStatus(result);
     1043            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndSetCalendarStatus(result);
    10441044            return new object[] {
    10451045                    retVal};
     
    10721072        }
    10731073       
    1074         public System.IO.Stream SendStreamedJob(System.Guid clientId) {
    1075             return base.Channel.SendStreamedJob(clientId);
    1076         }
    1077        
    1078         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1079         public System.IAsyncResult BeginSendStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
    1080             return base.Channel.BeginSendStreamedJob(clientId, callback, asyncState);
    1081         }
    1082        
    1083         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1084         public System.IO.Stream EndSendStreamedJob(System.IAsyncResult result) {
    1085             return base.Channel.EndSendStreamedJob(result);
    1086         }
    1087        
    1088         private System.IAsyncResult OnBeginSendStreamedJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
     1074        public System.IO.Stream GetStreamedJob(System.Guid clientId) {
     1075            return base.Channel.GetStreamedJob(clientId);
     1076        }
     1077       
     1078        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     1079        public System.IAsyncResult BeginGetStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
     1080            return base.Channel.BeginGetStreamedJob(clientId, callback, asyncState);
     1081        }
     1082       
     1083        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     1084        public System.IO.Stream EndGetStreamedJob(System.IAsyncResult result) {
     1085            return base.Channel.EndGetStreamedJob(result);
     1086        }
     1087       
     1088        private System.IAsyncResult OnBeginGetStreamedJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
    10891089            System.Guid clientId = ((System.Guid)(inValues[0]));
    1090             return this.BeginSendStreamedJob(clientId, callback, asyncState);
    1091         }
    1092        
    1093         private object[] OnEndSendStreamedJob(System.IAsyncResult result) {
    1094             System.IO.Stream retVal = this.EndSendStreamedJob(result);
    1095             return new object[] {
    1096                     retVal};
    1097         }
    1098        
    1099         private void OnSendStreamedJobCompleted(object state) {
    1100             if ((this.SendStreamedJobCompleted != null)) {
    1101                 InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
    1102                 this.SendStreamedJobCompleted(this, new SendStreamedJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
    1103             }
    1104         }
    1105        
    1106         public void SendStreamedJobAsync(System.Guid clientId) {
    1107             this.SendStreamedJobAsync(clientId, null);
    1108         }
    1109        
    1110         public void SendStreamedJobAsync(System.Guid clientId, object userState) {
    1111             if ((this.onBeginSendStreamedJobDelegate == null)) {
    1112                 this.onBeginSendStreamedJobDelegate = new BeginOperationDelegate(this.OnBeginSendStreamedJob);
    1113             }
    1114             if ((this.onEndSendStreamedJobDelegate == null)) {
    1115                 this.onEndSendStreamedJobDelegate = new EndOperationDelegate(this.OnEndSendStreamedJob);
    1116             }
    1117             if ((this.onSendStreamedJobCompletedDelegate == null)) {
    1118                 this.onSendStreamedJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendStreamedJobCompleted);
    1119             }
    1120             base.InvokeAsync(this.onBeginSendStreamedJobDelegate, new object[] {
    1121                         clientId}, this.onEndSendStreamedJobDelegate, this.onSendStreamedJobCompletedDelegate, userState);
    1122         }
    1123        
    1124         public System.IO.Stream SendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
    1125             return base.Channel.SendStreamedPlugins(pluginList);
    1126         }
    1127        
    1128         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1129         public System.IAsyncResult BeginSendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
    1130             return base.Channel.BeginSendStreamedPlugins(pluginList, callback, asyncState);
    1131         }
    1132        
    1133         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1134         public System.IO.Stream EndSendStreamedPlugins(System.IAsyncResult result) {
    1135             return base.Channel.EndSendStreamedPlugins(result);
    1136         }
    1137        
    1138         private System.IAsyncResult OnBeginSendStreamedPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
     1090            return this.BeginGetStreamedJob(clientId, callback, asyncState);
     1091        }
     1092       
     1093        private object[] OnEndGetStreamedJob(System.IAsyncResult result) {
     1094            System.IO.Stream retVal = this.EndGetStreamedJob(result);
     1095            return new object[] {
     1096                    retVal};
     1097        }
     1098       
     1099        private void OnGetStreamedJobCompleted(object state) {
     1100            if ((this.GetStreamedJobCompleted != null)) {
     1101                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
     1102                this.GetStreamedJobCompleted(this, new GetStreamedJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     1103            }
     1104        }
     1105       
     1106        public void GetStreamedJobAsync(System.Guid clientId) {
     1107            this.GetStreamedJobAsync(clientId, null);
     1108        }
     1109       
     1110        public void GetStreamedJobAsync(System.Guid clientId, object userState) {
     1111            if ((this.onBeginGetStreamedJobDelegate == null)) {
     1112                this.onBeginGetStreamedJobDelegate = new BeginOperationDelegate(this.OnBeginGetStreamedJob);
     1113            }
     1114            if ((this.onEndGetStreamedJobDelegate == null)) {
     1115                this.onEndGetStreamedJobDelegate = new EndOperationDelegate(this.OnEndGetStreamedJob);
     1116            }
     1117            if ((this.onGetStreamedJobCompletedDelegate == null)) {
     1118                this.onGetStreamedJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetStreamedJobCompleted);
     1119            }
     1120            base.InvokeAsync(this.onBeginGetStreamedJobDelegate, new object[] {
     1121                        clientId}, this.onEndGetStreamedJobDelegate, this.onGetStreamedJobCompletedDelegate, userState);
     1122        }
     1123       
     1124        public System.IO.Stream GetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
     1125            return base.Channel.GetStreamedPlugins(pluginList);
     1126        }
     1127       
     1128        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     1129        public System.IAsyncResult BeginGetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
     1130            return base.Channel.BeginGetStreamedPlugins(pluginList, callback, asyncState);
     1131        }
     1132       
     1133        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     1134        public System.IO.Stream EndGetStreamedPlugins(System.IAsyncResult result) {
     1135            return base.Channel.EndGetStreamedPlugins(result);
     1136        }
     1137       
     1138        private System.IAsyncResult OnBeginGetStreamedPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
    11391139            HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList = ((HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[])(inValues[0]));
    1140             return this.BeginSendStreamedPlugins(pluginList, callback, asyncState);
    1141         }
    1142        
    1143         private object[] OnEndSendStreamedPlugins(System.IAsyncResult result) {
    1144             System.IO.Stream retVal = this.EndSendStreamedPlugins(result);
    1145             return new object[] {
    1146                     retVal};
    1147         }
    1148        
    1149         private void OnSendStreamedPluginsCompleted(object state) {
    1150             if ((this.SendStreamedPluginsCompleted != null)) {
    1151                 InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
    1152                 this.SendStreamedPluginsCompleted(this, new SendStreamedPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
    1153             }
    1154         }
    1155        
    1156         public void SendStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
    1157             this.SendStreamedPluginsAsync(pluginList, null);
    1158         }
    1159        
    1160         public void SendStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
    1161             if ((this.onBeginSendStreamedPluginsDelegate == null)) {
    1162                 this.onBeginSendStreamedPluginsDelegate = new BeginOperationDelegate(this.OnBeginSendStreamedPlugins);
    1163             }
    1164             if ((this.onEndSendStreamedPluginsDelegate == null)) {
    1165                 this.onEndSendStreamedPluginsDelegate = new EndOperationDelegate(this.OnEndSendStreamedPlugins);
    1166             }
    1167             if ((this.onSendStreamedPluginsCompletedDelegate == null)) {
    1168                 this.onSendStreamedPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendStreamedPluginsCompleted);
    1169             }
    1170             base.InvokeAsync(this.onBeginSendStreamedPluginsDelegate, new object[] {
    1171                         pluginList}, this.onEndSendStreamedPluginsDelegate, this.onSendStreamedPluginsCompletedDelegate, userState);
    1172         }
    1173        
    1174         public HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream) {
     1140            return this.BeginGetStreamedPlugins(pluginList, callback, asyncState);
     1141        }
     1142       
     1143        private object[] OnEndGetStreamedPlugins(System.IAsyncResult result) {
     1144            System.IO.Stream retVal = this.EndGetStreamedPlugins(result);
     1145            return new object[] {
     1146                    retVal};
     1147        }
     1148       
     1149        private void OnGetStreamedPluginsCompleted(object state) {
     1150            if ((this.GetStreamedPluginsCompleted != null)) {
     1151                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
     1152                this.GetStreamedPluginsCompleted(this, new GetStreamedPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     1153            }
     1154        }
     1155       
     1156        public void GetStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
     1157            this.GetStreamedPluginsAsync(pluginList, null);
     1158        }
     1159       
     1160        public void GetStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
     1161            if ((this.onBeginGetStreamedPluginsDelegate == null)) {
     1162                this.onBeginGetStreamedPluginsDelegate = new BeginOperationDelegate(this.OnBeginGetStreamedPlugins);
     1163            }
     1164            if ((this.onEndGetStreamedPluginsDelegate == null)) {
     1165                this.onEndGetStreamedPluginsDelegate = new EndOperationDelegate(this.OnEndGetStreamedPlugins);
     1166            }
     1167            if ((this.onGetStreamedPluginsCompletedDelegate == null)) {
     1168                this.onGetStreamedPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetStreamedPluginsCompleted);
     1169            }
     1170            base.InvokeAsync(this.onBeginGetStreamedPluginsDelegate, new object[] {
     1171                        pluginList}, this.onEndGetStreamedPluginsDelegate, this.onGetStreamedPluginsCompletedDelegate, userState);
     1172        }
     1173       
     1174        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream) {
    11751175            return base.Channel.StoreFinishedJobResultStreamed(stream);
    11761176        }
     
    11821182       
    11831183        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1184         public HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result) {
     1184        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result) {
    11851185            return base.Channel.EndStoreFinishedJobResultStreamed(result);
    11861186        }
     
    11921192       
    11931193        private object[] OnEndStoreFinishedJobResultStreamed(System.IAsyncResult result) {
    1194             HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndStoreFinishedJobResultStreamed(result);
     1194            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndStoreFinishedJobResultStreamed(result);
    11951195            return new object[] {
    11961196                    retVal};
     
    12221222        }
    12231223       
    1224         public HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream) {
     1224        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream) {
    12251225            return base.Channel.ProcessSnapshotStreamed(stream);
    12261226        }
     
    12321232       
    12331233        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    1234         public HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result) {
     1234        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result) {
    12351235            return base.Channel.EndProcessSnapshotStreamed(result);
    12361236        }
     
    12421242       
    12431243        private object[] OnEndProcessSnapshotStreamed(System.IAsyncResult result) {
    1244             HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndProcessSnapshotStreamed(result);
     1244            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndProcessSnapshotStreamed(result);
    12451245            return new object[] {
    12461246                    retVal};
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.svcmap

    r4254 r4263  
    2727    <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="abb70224-775d-4edc-986c-20eede5dbe04" SourceId="1" SourceUrl="net.tcp://10.42.1.154:9000/HiveServer/mex" />
    2828    <MetadataFile FileName="HeuristicLab.DataAccess1.xsd" MetadataType="Schema" ID="55cbe34c-d0be-42ef-989a-a97018741832" SourceId="1" SourceUrl="net.tcp://10.42.1.154:9000/HiveServer/mex" />
     29    <MetadataFile FileName="HeuristicLab.Hive.Contracts.ResponseObjects.xsd" MetadataType="Schema" ID="9df34145-9053-480f-bf81-db99bfff513c" SourceId="1" SourceUrl="net.tcp://10.42.1.154:9000/HiveServer/mex" />
    2930    <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="d4834dd8-d9fe-4ce9-b5e9-dd9fe5451fbe" SourceId="1" SourceUrl="net.tcp://10.42.1.154:9000/HiveServer/mex" />
    3031    <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="7f60dd4e-614e-4b85-a4e7-a4caac529103" SourceId="1" SourceUrl="net.tcp://10.42.1.154:9000/HiveServer/mex" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/service1.wsdl

    r4254 r4263  
    1919      <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
    2020      <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" />
     21      <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" />
    2122      <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" />
    2223      <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
     
    6869    <wsdl:part name="parameters" element="tns:IsJobStillNeededResponse" />
    6970  </wsdl:message>
    70   <wsdl:message name="ISlaveFacade_SendPlugins_InputMessage">
    71     <wsdl:part name="parameters" element="tns:SendPlugins" />
    72   </wsdl:message>
    73   <wsdl:message name="ISlaveFacade_SendPlugins_OutputMessage">
    74     <wsdl:part name="parameters" element="tns:SendPluginsResponse" />
     71  <wsdl:message name="ISlaveFacade_GetPlugins_InputMessage">
     72    <wsdl:part name="parameters" element="tns:GetPlugins" />
     73  </wsdl:message>
     74  <wsdl:message name="ISlaveFacade_GetPlugins_OutputMessage">
     75    <wsdl:part name="parameters" element="tns:GetPluginsResponse" />
    7576  </wsdl:message>
    7677  <wsdl:message name="ISlaveFacade_GetCalendar_InputMessage">
     
    8687    <wsdl:part name="parameters" element="tns:SetCalendarStatusResponse" />
    8788  </wsdl:message>
    88   <wsdl:message name="ISlaveFacade_SendStreamedJob_InputMessage">
    89     <wsdl:part name="parameters" element="tns:SendStreamedJob" />
    90   </wsdl:message>
    91   <wsdl:message name="ISlaveFacade_SendStreamedJob_OutputMessage">
    92     <wsdl:part name="parameters" element="tns:SendStreamedJobResponse" />
    93   </wsdl:message>
    94   <wsdl:message name="ISlaveFacade_SendStreamedPlugins_InputMessage">
    95     <wsdl:part name="parameters" element="tns:SendStreamedPlugins" />
    96   </wsdl:message>
    97   <wsdl:message name="ISlaveFacade_SendStreamedPlugins_OutputMessage">
    98     <wsdl:part name="parameters" element="tns:SendStreamedPluginsResponse" />
     89  <wsdl:message name="ISlaveFacade_GetStreamedJob_InputMessage">
     90    <wsdl:part name="parameters" element="tns:GetStreamedJob" />
     91  </wsdl:message>
     92  <wsdl:message name="ISlaveFacade_GetStreamedJob_OutputMessage">
     93    <wsdl:part name="parameters" element="tns:GetStreamedJobResponse" />
     94  </wsdl:message>
     95  <wsdl:message name="ISlaveFacade_GetStreamedPlugins_InputMessage">
     96    <wsdl:part name="parameters" element="tns:GetStreamedPlugins" />
     97  </wsdl:message>
     98  <wsdl:message name="ISlaveFacade_GetStreamedPlugins_OutputMessage">
     99    <wsdl:part name="parameters" element="tns:GetStreamedPluginsResponse" />
    99100  </wsdl:message>
    100101  <wsdl:message name="ISlaveFacade_StoreFinishedJobResultStreamed_InputMessage">
     
    139140      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/IsJobStillNeededResponse" message="tns:ISlaveFacade_IsJobStillNeeded_OutputMessage" />
    140141    </wsdl:operation>
    141     <wsdl:operation name="SendPlugins">
    142       <wsdl:input wsaw:Action="http://tempuri.org/ISlaveCommunicator/SendPlugins" message="tns:ISlaveFacade_SendPlugins_InputMessage" />
    143       <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/SendPluginsResponse" message="tns:ISlaveFacade_SendPlugins_OutputMessage" />
     142    <wsdl:operation name="GetPlugins">
     143      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveCommunicator/GetPlugins" message="tns:ISlaveFacade_GetPlugins_InputMessage" />
     144      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/GetPluginsResponse" message="tns:ISlaveFacade_GetPlugins_OutputMessage" />
    144145    </wsdl:operation>
    145146    <wsdl:operation name="GetCalendar">
     
    151152      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/SetCalendarStatusResponse" message="tns:ISlaveFacade_SetCalendarStatus_OutputMessage" />
    152153    </wsdl:operation>
    153     <wsdl:operation name="SendStreamedJob">
    154       <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedJob" message="tns:ISlaveFacade_SendStreamedJob_InputMessage" />
    155       <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedJobResponse" message="tns:ISlaveFacade_SendStreamedJob_OutputMessage" />
    156     </wsdl:operation>
    157     <wsdl:operation name="SendStreamedPlugins">
    158       <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedPlugins" message="tns:ISlaveFacade_SendStreamedPlugins_InputMessage" />
    159       <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedPluginsResponse" message="tns:ISlaveFacade_SendStreamedPlugins_OutputMessage" />
     154    <wsdl:operation name="GetStreamedJob">
     155      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedJob" message="tns:ISlaveFacade_GetStreamedJob_InputMessage" />
     156      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedJobResponse" message="tns:ISlaveFacade_GetStreamedJob_OutputMessage" />
     157    </wsdl:operation>
     158    <wsdl:operation name="GetStreamedPlugins">
     159      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedPlugins" message="tns:ISlaveFacade_GetStreamedPlugins_InputMessage" />
     160      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedPluginsResponse" message="tns:ISlaveFacade_GetStreamedPlugins_OutputMessage" />
    160161    </wsdl:operation>
    161162    <wsdl:operation name="StoreFinishedJobResultStreamed">
     
    235236      </wsdl:output>
    236237    </wsdl:operation>
    237     <wsdl:operation name="SendPlugins">
    238       <soap12:operation soapAction="http://tempuri.org/ISlaveCommunicator/SendPlugins" style="document" />
     238    <wsdl:operation name="GetPlugins">
     239      <soap12:operation soapAction="http://tempuri.org/ISlaveCommunicator/GetPlugins" style="document" />
    239240      <wsdl:input>
    240241        <soap12:body use="literal" />
     
    262263      </wsdl:output>
    263264    </wsdl:operation>
    264     <wsdl:operation name="SendStreamedJob">
    265       <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/SendStreamedJob" style="document" />
    266       <wsdl:input>
    267         <soap12:body use="literal" />
    268       </wsdl:input>
    269       <wsdl:output>
    270         <soap12:body use="literal" />
    271       </wsdl:output>
    272     </wsdl:operation>
    273     <wsdl:operation name="SendStreamedPlugins">
    274       <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/SendStreamedPlugins" style="document" />
     265    <wsdl:operation name="GetStreamedJob">
     266      <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/GetStreamedJob" style="document" />
     267      <wsdl:input>
     268        <soap12:body use="literal" />
     269      </wsdl:input>
     270      <wsdl:output>
     271        <soap12:body use="literal" />
     272      </wsdl:output>
     273    </wsdl:operation>
     274    <wsdl:operation name="GetStreamedPlugins">
     275      <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/GetStreamedPlugins" style="document" />
    275276      <wsdl:input>
    276277        <soap12:body use="literal" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/service2.xsd

    r4254 r4263  
    22<xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
    33  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
    4   <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" />
     4  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" />
    55  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
    66  <xs:import namespace="http://schemas.microsoft.com/Message" />
     
    1515    <xs:complexType>
    1616      <xs:sequence>
    17         <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LoginResult" nillable="true" type="q2:Response" />
     17        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="LoginResult" nillable="true" type="q2:Response" />
    1818      </xs:sequence>
    1919    </xs:complexType>
     
    2929    <xs:complexType>
    3030      <xs:sequence>
    31         <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessHeartBeatResult" nillable="true" type="q4:ResponseHeartBeat" />
     31        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="ProcessHeartBeatResult" nillable="true" type="q4:ResponseHeartBeat" />
    3232      </xs:sequence>
    3333    </xs:complexType>
     
    4343    <xs:complexType>
    4444      <xs:sequence>
    45         <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="GetJobResult" nillable="true" type="q6:ResponseObjectOfJobDtoZAa7YIsz" />
     45        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="GetJobResult" nillable="true" type="q6:ResponseObjectOfJobDtoZAa7YIsz" />
    4646      </xs:sequence>
    4747    </xs:complexType>
     
    6161    <xs:complexType>
    6262      <xs:sequence>
    63         <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
     63        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="StoreFinishedJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
    6464      </xs:sequence>
    6565    </xs:complexType>
     
    7979    <xs:complexType>
    8080      <xs:sequence>
    81         <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotResult" nillable="true" type="q12:ResponseResultReceived" />
     81        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="ProcessSnapshotResult" nillable="true" type="q12:ResponseResultReceived" />
    8282      </xs:sequence>
    8383    </xs:complexType>
     
    9393    <xs:complexType>
    9494      <xs:sequence>
    95         <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LogoutResult" nillable="true" type="q14:Response" />
     95        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="LogoutResult" nillable="true" type="q14:Response" />
    9696      </xs:sequence>
    9797    </xs:complexType>
     
    107107    <xs:complexType>
    108108      <xs:sequence>
    109         <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="IsJobStillNeededResult" nillable="true" type="q16:Response" />
    110       </xs:sequence>
    111     </xs:complexType>
    112   </xs:element>
    113   <xs:element name="SendPlugins">
     109        <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="IsJobStillNeededResult" nillable="true" type="q16:Response" />
     110      </xs:sequence>
     111    </xs:complexType>
     112  </xs:element>
     113  <xs:element name="GetPlugins">
    114114    <xs:complexType>
    115115      <xs:sequence>
     
    118118    </xs:complexType>
    119119  </xs:element>
    120   <xs:element name="SendPluginsResponse">
    121     <xs:complexType>
    122       <xs:sequence>
    123         <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendPluginsResult" nillable="true" type="q18:ResponseListOfCachedHivePluginInfoDtoZMwZop09" />
     120  <xs:element name="GetPluginsResponse">
     121    <xs:complexType>
     122      <xs:sequence>
     123        <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="GetPluginsResult" nillable="true" type="q18:ResponseListOfCachedHivePluginInfoDtoZMwZop09" />
    124124      </xs:sequence>
    125125    </xs:complexType>
     
    135135    <xs:complexType>
    136136      <xs:sequence>
    137         <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="GetCalendarResult" nillable="true" type="q20:ResponseCalendar" />
     137        <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="GetCalendarResult" nillable="true" type="q20:ResponseCalendar" />
    138138      </xs:sequence>
    139139    </xs:complexType>
     
    150150    <xs:complexType>
    151151      <xs:sequence>
    152         <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SetCalendarStatusResult" nillable="true" type="q23:Response" />
    153       </xs:sequence>
    154     </xs:complexType>
    155   </xs:element>
    156   <xs:element name="SendStreamedJob">
     152        <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="SetCalendarStatusResult" nillable="true" type="q23:Response" />
     153      </xs:sequence>
     154    </xs:complexType>
     155  </xs:element>
     156  <xs:element name="GetStreamedJob">
    157157    <xs:complexType>
    158158      <xs:sequence>
     
    161161    </xs:complexType>
    162162  </xs:element>
    163   <xs:element name="SendStreamedJobResponse">
    164     <xs:complexType>
    165       <xs:sequence>
    166         <xs:element xmlns:q25="http://schemas.microsoft.com/Message" name="SendStreamedJobResult" type="q25:StreamBody" />
    167       </xs:sequence>
    168     </xs:complexType>
    169   </xs:element>
    170   <xs:element name="SendStreamedPlugins">
     163  <xs:element name="GetStreamedJobResponse">
     164    <xs:complexType>
     165      <xs:sequence>
     166        <xs:element xmlns:q25="http://schemas.microsoft.com/Message" name="GetStreamedJobResult" type="q25:StreamBody" />
     167      </xs:sequence>
     168    </xs:complexType>
     169  </xs:element>
     170  <xs:element name="GetStreamedPlugins">
    171171    <xs:complexType>
    172172      <xs:sequence>
     
    175175    </xs:complexType>
    176176  </xs:element>
    177   <xs:element name="SendStreamedPluginsResponse">
    178     <xs:complexType>
    179       <xs:sequence>
    180         <xs:element xmlns:q27="http://schemas.microsoft.com/Message" name="SendStreamedPluginsResult" type="q27:StreamBody" />
     177  <xs:element name="GetStreamedPluginsResponse">
     178    <xs:complexType>
     179      <xs:sequence>
     180        <xs:element xmlns:q27="http://schemas.microsoft.com/Message" name="GetStreamedPluginsResult" type="q27:StreamBody" />
    181181      </xs:sequence>
    182182    </xs:complexType>
     
    192192    <xs:complexType>
    193193      <xs:sequence>
    194         <xs:element xmlns:q29="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultStreamedResult" nillable="true" type="q29:ResponseResultReceived" />
     194        <xs:element xmlns:q29="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="StoreFinishedJobResultStreamedResult" nillable="true" type="q29:ResponseResultReceived" />
    195195      </xs:sequence>
    196196    </xs:complexType>
     
    206206    <xs:complexType>
    207207      <xs:sequence>
    208         <xs:element xmlns:q31="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotStreamedResult" nillable="true" type="q31:ResponseResultReceived" />
     208        <xs:element xmlns:q31="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="ProcessSnapshotStreamedResult" nillable="true" type="q31:ResponseResultReceived" />
    209209      </xs:sequence>
    210210    </xs:complexType>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

    r4254 r4263  
    3737  using Service = HeuristicLab.Hive.Slave.Communication.ServerService;
    3838  using HeuristicLab.Hive.Slave.Communication.ServerService;
     39  using HeuristicLab.Hive.Contracts.ResponseObjects;
    3940
    4041  /// <summary>
     
    9596        Logger.Debug("Registring new Events");
    9697        proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
    97         proxy.SendStreamedJobCompleted += new EventHandler<SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
     98        proxy.GetStreamedJobCompleted += new EventHandler<GetStreamedJobCompletedEventArgs>(proxy_GetStreamedJobCompleted);
    9899        proxy.StoreFinishedJobResultStreamedCompleted += new EventHandler<StoreFinishedJobResultStreamedCompletedEventArgs>(proxy_StoreFinishedJobResultStreamedCompleted);
    99100        proxy.ProcessSnapshotStreamedCompleted += new EventHandler<ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
     
    159160    }
    160161
    161 
    162 
    163162    /// <summary>
    164163    /// Methods for the Server Login
     
    184183        if (ConnState == NetworkEnum.WcfConnState.Connected) {
    185184          Logger.Debug("STARTED: Login Sync");
    186           HeuristicLab.Hive.Contracts.Response res = proxy.Login(clientInfo);
    187           if (!res.Success) {
     185          Response res = proxy.Login(clientInfo);
     186          if (res.StatusMessage != ResponseStatus.Ok) {
    188187            Logger.Error("FAILED: Login Failed! " + res.StatusMessage);
    189             throw new Exception(res.StatusMessage);
     188            throw new Exception(res.StatusMessage.ToString());
    190189          } else {
    191190            Logger.Info("ENDED: Login succeeded" + res.StatusMessage);
     
    204203    /// </summary>
    205204    #region PullJob
    206     public event System.EventHandler<GetJobCompletedEventArgs> SendJobCompleted;
    207     public void SendJobAsync(Guid guid) {
     205    public event System.EventHandler<GetJobCompletedEventArgs> GetJobCompleted;
     206    public void GetJobAsync(Guid guid) {
    208207      if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
    209208        Logger.Debug("STARTED: Fetching of Jobs from Server for Client");
    210         proxy.SendStreamedJobAsync(guid);
    211       }
    212     }
    213 
    214     void proxy_SendStreamedJobCompleted(object sender, SendStreamedJobCompletedEventArgs e) {
     209        proxy.GetStreamedJobAsync(guid);
     210      }
     211    }
     212
     213    void proxy_GetStreamedJobCompleted(object sender, GetStreamedJobCompletedEventArgs e) {
    215214      if (e.Error == null) {
    216215        Logger.Debug("ENDED: Fetching of Jobs from Server for Client");
     
    237236
    238237          GetJobCompletedEventArgs completedEventArgs = new GetJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
    239           SendJobCompleted(sender, completedEventArgs);
     238          GetJobCompleted(sender, completedEventArgs);
    240239        } catch (Exception ex) {
    241240          Logger.Error(ex);
     
    257256    /// </summary>
    258257    #region SendJobResults
    259     public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
    260     public void StoreFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
     258    public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> GetFinishedJobResultCompleted;
     259    public void GetFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
    261260      if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
    262261        Logger.Debug("STARTED: Sending back the finished job results");
     
    279278        StoreFinishedJobResultCompletedEventArgs args = new StoreFinishedJobResultCompletedEventArgs(new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
    280279        Logger.Debug("calling the Finished Job Event");
    281         StoreFinishedJobResultCompleted(sender, args);
     280        GetFinishedJobResultCompleted(sender, args);
    282281        Logger.Debug("ENDED: Sending back the finished job results");
    283282      } else {
     
    328327
    329328    private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
    330       if (e.Error == null && e.Result.Success) {
     329      if (e.Error == null && e.Result.StatusMessage == ResponseStatus.Ok) {
    331330        ProcessHeartBeatCompleted(sender, e);
    332331        Logger.Debug("ENDED: sending heartbeats");
     
    394393        Logger.Debug("STARTED: Requesting Plugins for Job");
    395394        Logger.Debug("STARTED: Getting the stream");
    396         Stream stream = proxy.SendStreamedPlugins(requestedPlugins.ToArray());
     395        Stream stream = proxy.GetStreamedPlugins(requestedPlugins.ToArray());
    397396        Logger.Debug("ENDED: Getting the stream");
    398397        BinaryFormatter formatter = new BinaryFormatter();
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs

    r4254 r4263  
    1010using HeuristicLab.Hive.Contracts;
    1111using HeuristicLab.Tracing;
     12using HeuristicLab.Hive.Contracts.ResponseObjects;
    1213
    1314namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

    r4254 r4263  
    4747using HeuristicLab.Core;
    4848using System.IO;
     49using HeuristicLab.Hive.Contracts.ResponseObjects;
    4950
    5051namespace HeuristicLab.Hive.Slave.Core {
     
    8889      wcfService = WcfService.Instance;
    8990      wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
    90       wcfService.SendJobCompleted += new EventHandler<GetJobCompletedEventArgs>(wcfService_GetJobCompleted);
    91       wcfService.StoreFinishedJobResultCompleted += new EventHandler<StoreFinishedJobResultCompletedEventArgs>(wcfService_StoreFinishedJobResultCompleted);
     91      wcfService.GetJobCompleted += new EventHandler<GetJobCompletedEventArgs>(wcfService_GetJobCompleted);
     92      wcfService.GetFinishedJobResultCompleted += new EventHandler<StoreFinishedJobResultCompletedEventArgs>(wcfService_StoreFinishedJobResultCompleted);
    9293      wcfService.ProcessSnapshotCompleted += new EventHandler<ProcessSnapshotCompletedEventArgs>(wcfService_ProcessSnapshotCompleted);
    9394      wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
     
    153154        case MessageContainer.MessageType.FetchJob:
    154155          if (!CurrentlyFetching) {
    155             wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().Id);
     156            wcfService.GetJobAsync(ConfigManager.Instance.GetClientInfo().Id);
    156157            CurrentlyFetching = true;
    157158          } else
     
    232233        if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
    233234          Logger.Info("Sending the finished job with id: " + jId);
    234           wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
     235          wcfService.GetFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
    235236        } else {
    236237          Logger.Info("Storing the finished job with id: " + jId + " to hdd");
     
    286287    /// <param name="e"></param>
    287288    void wcfService_LoginCompleted(object sender, LoginCompletedEventArgs e) {
    288       if (e.Result.Success) {
     289      if (e.Result.StatusMessage == ResponseStatus.Ok) {
    289290        CurrentlyFetching = false;
    290291        Logger.Info("Login completed to Hive Server @ " + DateTime.Now);
    291292      } else
    292         Logger.Error("Error during login: " + e.Result.StatusMessage);
     293        Logger.Error("Error during login: " + e.Result.StatusMessage.ToString());
    293294    }
    294295
     
    299300    /// <param name="e"></param>
    300301    void wcfService_GetJobCompleted(object sender, GetJobCompletedEventArgs e) {
    301       if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
     302      if (e.Result.StatusMessage != ResponseStatus.GetJob_NoJobsAvailable) {
    302303        Logger.Info("Received new job with id " + e.Result.Obj.Id);
    303304        bool sandboxed = false;
     
    355356      Logger.Info("Job submitted with id " + e.Result.JobId);
    356357      KillAppDomain(e.Result.JobId);
    357       if (e.Result.Success) {
     358      if (e.Result.StatusMessage == ResponseStatus.Ok) {
    358359        SlaveStatusInfo.JobsProcessed++;
    359360        Logger.Info("Increased ProcessedJobs to:" + SlaveStatusInfo.JobsProcessed);
     
    415416    private void FetchCalendarFromServer() {
    416417      ResponseCalendar calres = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
    417       if (calres.Success) {
     418      if (calres.StatusMessage == ResponseStatus.Ok) {
    418419        if (UptimeManager.Instance.SetAppointments(false, calres)) {
    419420          Logger.Info("Remote calendar installed");
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs

    r4254 r4263  
    1212using System.Xml;
    1313using HeuristicLab.Tracing;
     14using HeuristicLab.Hive.Contracts.ResponseObjects;
    1415
    1516namespace HeuristicLab.Hive.Slave.Core.JobStorage {
     
    4950          try {
    5051            byte[] job = File.ReadAllBytes(path + filename + ".dat");
    51             if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT) {
     52            if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ResponseStatus.Ok) {
    5253              ResponseResultReceived res = WcfService.Instance.StoreFinishedJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
    53               if (!res.Success)
    54                 Logger.Error("sending of job failed: " + res.StatusMessage);
    55               else
    56                 Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
     54              Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
    5755            }
    5856            SlaveStatusInfo.JobsProcessed++;
Note: See TracChangeset for help on using the changeset viewer.