Changeset 4263 for branches

Timestamp:

08/19/10 12:41:05 (14 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:

• HeuristicLab.Hive.Contracts/3.3/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/CachedHivePluginInfo.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/Client.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientConfig.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientGroup.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/GrantedPermissions.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HiveBaseObject.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HivePluginInfo.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/IHiveObject.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/Job.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/Permission.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/PermissionOwner.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/Project.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/Resource.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/UpTimeStatistics.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/User.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/UserGroup.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IExecutionEngineFacade.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveCommunicator.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveFacade.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IUserRoleManager.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/Response.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseCalendar.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseHeartBeat.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseJob.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseList.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseObject.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects (added)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects/Response.cs (added)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects/ResponseCalendar.cs (added)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects/ResponseHeartBeat.cs (added)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects/ResponseList.cs (added)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects/ResponseObject.cs (added)
• HeuristicLab.Hive.Contracts/3.3/ResponseObjects/ResponseResultReceived.cs (added)
• HeuristicLab.Hive.Contracts/3.3/ResponsePlugin.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseResultReceived.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseSerializedJob.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/ResponseStatus.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.cs (modified) (2 diffs)
• HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (modified) (5 diffs)
• HeuristicLab.Hive.Experiment/3.3/JobItem.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/CgCalendar.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Authorization/HivePermissionManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs (modified) (6 diffs)
• HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IInternalSlaveCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/JobManager.cs (modified) (19 diffs)
• HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs (modified) (26 diffs)
• HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs (modified) (13 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/Properties/DataSources/HeuristicLab.Hive.Contracts.ResponseObjects.Response.datasource (added)
• HeuristicLab.Hive.Slave.Communication/3.3/Properties/DataSources/HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar.datasource (added)
• HeuristicLab.Hive.Slave.Communication/3.3/Properties/DataSources/HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat.datasource (added)
• HeuristicLab.Hive.Slave.Communication/3.3/Properties/DataSources/HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived.datasource (added)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/HeuristicLab.Hive.Contracts.ResponseObjects.xsd (added)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.cs (modified) (50 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.svcmap (modified) (1 diff)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/service1.wsdl (modified) (7 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/service2.xsd (modified) (15 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs (modified) (10 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (8 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs (modified) (2 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ApplicationConstants.cs

@@ -38 +38 @@
     public static int JOB_TIME_TO_LIVE = 5;
 
-    public static string RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS = "Logged in";
-    public static string RESPONSE_SERVERCONSOLE_LOGIN_FAILED = "Login failed";
+    //public static string RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS = "Logged in";
+    //public static string RESPONSE_SERVERCONSOLE_LOGIN_FAILED = "Login failed";
 
-    public static string RESPONSE_USERROLE_GET_ALL_USERS = "UserRole.GetAllUsers";
-    public static string RESPONSE_USERROLE_USER_EXISTS_ALLREADY = "UserRole.UserExistsAllready";
-    public static string RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED = "UserRole.UserSuccessfullyAdded";
-    public static string RESPONSE_USERROLE_USER_DOESNT_EXIST = "UserRole.UserDoesntExist";
-    public static string RESPONSE_USERROLE_USER_REMOVED = "UserRole.UserRemoved";
-    public static string RESPONSE_USERROLE_USERGROUP_EXISTS_ALLREADY = "UserRole.UsergroupExistsAllready";
-    public static string RESPONSE_USERROLE_USERGROUP_ADDED = "UserRole.UserGroupAdded";
-    public static string RESPONSE_USERROLE_USERGROUP_DOESNT_EXIST = "UserRole.UserGroupDoesntExist";
-    public static string RESPONSE_USERROLE_PERMISSIONOWNER_DOESNT_EXIST = "UserRole.PermissionOwnerDoesntExist";
-    public static string RESPONSE_USERROLE_PERMISSIONOWNER_REMOVED = "UserRole.PermissionOwnerRemoved";
-    public static string RESPONSE_USERROLE_PERMISSIONOWNER_ADDED = "UserRole.PermissionOwnerAdded";
-    public static string RESPONSE_USERROLE_GET_ALL_USERGROUPS = "UserRole.AllUserGroupsReturned";
-    public static string RESPONSE_USERROLE_ID_MUST_NOT_BE_SET = "UserRole.IdMustNotBeSet";
-    public static string RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP = "UserRole.UserGroupAddedToUserGroup";
-    public static string RESPONSE_USERROLE_USERNAME_EXISTS_ALLREADY = "UserRole.UsernameExistsAllready";
+    //public static string RESPONSE_USERROLE_GET_ALL_USERS = "UserRole.GetAllUsers";
+    //public static string RESPONSE_USERROLE_USER_EXISTS_ALLREADY = "UserRole.UserExistsAllready";
+    //public static string RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED = "UserRole.UserSuccessfullyAdded";
+    //public static string RESPONSE_USERROLE_USER_DOESNT_EXIST = "UserRole.UserDoesntExist";
+    //public static string RESPONSE_USERROLE_USER_REMOVED = "UserRole.UserRemoved";
+    //public static string RESPONSE_USERROLE_USERGROUP_EXISTS_ALLREADY = "UserRole.UsergroupExistsAllready";
+    //public static string RESPONSE_USERROLE_USERGROUP_ADDED = "UserRole.UserGroupAdded";
+    //public static string RESPONSE_USERROLE_USERGROUP_DOESNT_EXIST = "UserRole.UserGroupDoesntExist";
+    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_DOESNT_EXIST = "UserRole.PermissionOwnerDoesntExist";
+    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_REMOVED = "UserRole.PermissionOwnerRemoved";
+    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_ADDED = "UserRole.PermissionOwnerAdded";
+    //public static string RESPONSE_USERROLE_GET_ALL_USERGROUPS = "UserRole.AllUserGroupsReturned";
+    //public static string RESPONSE_USERROLE_ID_MUST_NOT_BE_SET = "UserRole.IdMustNotBeSet";
+    //public static string RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP = "UserRole.UserGroupAddedToUserGroup";
+    //public static string RESPONSE_USERROLE_USERNAME_EXISTS_ALLREADY = "UserRole.UsernameExistsAllready";
 
-    public static string RESPONSE_CLIENT_GET_ALL_CLIENTS = "Client.GetAllClients";
-    public static string RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS = "Client.GetAllClientGroups";
-    public static string RESPONSE_CLIENT_ID_MUST_NOT_BE_SET = "Client.IdMustNotBeSet";
-    public static string RESPONSE_CLIENT_CLIENTGROUP_ADDED = "Client.ClientGroupAdded";
-    public static string RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST = "Client.ClientGroupDoesntExist";
-    public static string RESPONSE_CLIENT_CLIENTGROUP_DELETED = "Client group sucessfully deleted"; 
-    public static string RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP = "Client.ResourceAddedToGroup";
-    public static string RESPONSE_CLIENT_RESOURCE_REMOVED = "Client.ResourceRemoved";
-    public static string RESPONSE_CLIENT_RESOURCE_NOT_FOUND = "Client.ResourceNotFound";
-    public static string RESPONSE_CLIENT_PERMISSIONOWNER_DOESNT_EXIST = "Client.PermissionOwnerDoesntExist";
-    public static string RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT = "Get all groups of a client";
+    //public static string RESPONSE_CLIENT_GET_ALL_CLIENTS = "Client.GetAllClients";
+    //public static string RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS = "Client.GetAllClientGroups";
+    //public static string RESPONSE_CLIENT_ID_MUST_NOT_BE_SET = "Client.IdMustNotBeSet";
+    //public static string RESPONSE_CLIENT_CLIENTGROUP_ADDED = "Client.ClientGroupAdded";
+    //public static string RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST = "Client.ClientGroupDoesntExist";
+    //public static string RESPONSE_CLIENT_CLIENTGROUP_DELETED = "Client group sucessfully deleted"; 
+    //public static string RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP = "Client.ResourceAddedToGroup";
+    //public static string RESPONSE_CLIENT_RESOURCE_REMOVED = "Client.ResourceRemoved";
+    //public static string RESPONSE_CLIENT_RESOURCE_NOT_FOUND = "Client.ResourceNotFound";
+    //public static string RESPONSE_CLIENT_PERMISSIONOWNER_DOESNT_EXIST = "Client.PermissionOwnerDoesntExist";
+    //public static string RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT = "Get all groups of a client";
 
-    public static string RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED = "Communicator.HeardbeatReceived";
-    public static string RESPONSE_COMMUNICATOR_JOB_PULLED = "Communicator.JobPulled";
-    public static string RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED = "Communicator.JobResultReceived";
-    public static string RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE = "Communicator.LoginUserAllreadyOnline";
-    public static string RESPONSE_COMMUNICATOR_LOGIN_SUCCESS = "Communicator.LoginSuccess";
-    public static string RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED = "Communicator.LogoutClientNotRegistered";
-    public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
-    public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
-    public static string RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET = "Communicator.IdMustNotBeSet";
-    public static string RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID = "Communicator.NoJobWithThisId";
-    public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
-    public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
-    public static string RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED = "Communicator.JobIsNotBeenigCalculated";
-    public static string RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB = "Communicator.WrongClientForJob";
-    public static string RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED = "Job allready finished. Not needed anymore";
-    public static string RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST = "No job exists with this id";
-    public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
-    public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
-    public static string RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL = "Communicator.PluginsNotAvail";
-    public static string RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
+    //public static string RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED = "Communicator.HeardbeatReceived";
+    //public static string RESPONSE_COMMUNICATOR_JOB_PULLED = "Communicator.JobPulled";
+    //public static string RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED = "Communicator.JobResultReceived";
+    //public static string RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE = "Communicator.LoginUserAllreadyOnline";
+    //public static string RESPONSE_COMMUNICATOR_LOGIN_SUCCESS = "Communicator.LoginSuccess";
+    //public static string RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED = "Communicator.LogoutClientNotRegistered";
+    //public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
+    //public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
+    //public static string RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET = "Communicator.IdMustNotBeSet";
+    //public static string RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID = "Communicator.NoJobWithThisId";
+    //public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
+    //public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
+    //public static string RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED = "Communicator.JobIsNotBeenigCalculated";
+    //public static string RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB = "Communicator.WrongClientForJob";
+    //public static string RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED = "Job allready finished. Not needed anymore";
+    //public static string RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST = "No job exists with this id";
+    //public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
+    //public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
+    //public static string RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL = "Communicator.PluginsNotAvail";
+    //public static string RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
 
-    public static string RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR = "new Calendar must be fetched / force fetched";
+    //public static string RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR = "new Calendar must be fetched / force fetched";
 
-    public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";
-    public static string RESPONSE_JOB_GET_JOB_BY_ID = "Job.GetJobById";
-    public static string RESPONSE_JOB_ID_MUST_NOT_BE_SET = "Job.IdMustNotBeSet";
-    public static string RESPONSE_JOB_JOB_ADDED = "Job.JobAdded";
-    public static string RESPONSE_JOB_JOB_NULL = "Job.JobNull";
-    public static string RESPONSE_JOB_JOB_DOESNT_EXIST = "JobDoesntExist";
-    public static string RESPONSE_JOB_JOB_REMOVED = "Job.JobRemoved";
-    public static string RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE = "Job.JobStateMustBeOffline";
-    public static string RESPONSE_JOB_IS_NOT_BEEING_CALCULATED = "Job.IsNotBeeingCalculated";
-    public static string RESPONSE_JOB_JOB_RESULT_SENT = "Job.JobResultSent";
-    public static string RESPONSE_JOB_REQUEST_ALLREADY_SET = "Job.RequestAllreadySet";
-    public static string RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET = "Job.AbortRequestAllreadySet";
-    public static string RESPONSE_JOB_REQUEST_SET = "Job.RequestSet";
-    public static string RESPONSE_JOB_ABORT_REQUEST_SET = "Job.AbortRequestSet";
-    public static string RESPONSE_JOB_RESULT_NOT_YET_HERE = "Requested job result is not yet finished";
-    public static string RESPONSE_JOB_PROJECT_NAME_EMPTY = "Please specifiy a project name";
-    public static string RESPONSE_JOB_PROJECT_ADDED = "Project successfully added";
-    public static string RESPONSE_JOB_PROJECT_DOESNT_EXIST = "The specified project doesn't exist";
-    public static string RESPONSE_JOB_PROJECT_DELETED = "The project was sucessfully deleted";
+    //public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";
+    //public static string RESPONSE_JOB_GET_JOB_BY_ID = "Job.GetJobById";
+    //public static string RESPONSE_JOB_ID_MUST_NOT_BE_SET = "Job.IdMustNotBeSet";
+    //public static string RESPONSE_JOB_JOB_ADDED = "Job.JobAdded";
+    //public static string RESPONSE_JOB_JOB_NULL = "Job.JobNull";
+    //public static string RESPONSE_JOB_JOB_DOESNT_EXIST = "JobDoesntExist";
+    //public static string RESPONSE_JOB_JOB_REMOVED = "Job.JobRemoved";
+    //public static string RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE = "Job.JobStateMustBeOffline";
+    //public static string RESPONSE_JOB_IS_NOT_BEEING_CALCULATED = "Job.IsNotBeeingCalculated";
+    //public static string RESPONSE_JOB_JOB_RESULT_SENT = "Job.JobResultSent";
+    //public static string RESPONSE_JOB_REQUEST_ALLREADY_SET = "Job.RequestAllreadySet";
+    //public static string RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET = "Job.AbortRequestAllreadySet";
+    //public static string RESPONSE_JOB_REQUEST_SET = "Job.RequestSet";
+    //public static string RESPONSE_JOB_ABORT_REQUEST_SET = "Job.AbortRequestSet";
+    //public static string RESPONSE_JOB_RESULT_NOT_YET_HERE = "Requested job result is not yet finished";
+    //public static string RESPONSE_JOB_PROJECT_NAME_EMPTY = "Please specifiy a project name";
+    //public static string RESPONSE_JOB_PROJECT_ADDED = "Project successfully added";
+    //public static string RESPONSE_JOB_PROJECT_DOESNT_EXIST = "The specified project doesn't exist";
+    //public static string RESPONSE_JOB_PROJECT_DELETED = "The project was sucessfully deleted";
 
-    public static string RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND = "No Calendar could be found anywhere in the tree";
-    public static string RESPONSE_UPTIMECALENDAR_STATUS_UPDATED = "Calendar status has been updated";
+    //public static string RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND = "No Calendar could be found anywhere in the tree";
+    //public static string RESPONSE_UPTIMECALENDAR_STATUS_UPDATED = "Calendar status has been updated";
   }
 }

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

@@ -134 +134 @@
     <Compile Include="BusinessObjects\ClientGroupDtoList.cs" />
     <Compile Include="RecurrentEvent.cs" />
-    <Compile Include="ResponseCalendar.cs" />
+    <Compile Include="ResponseObjects\ResponseCalendar.cs" />
     <Compile Include="MultiStream.cs" />
     <Compile Include="Interfaces\ISlaveFacade.cs" />
     <Compile Include="Interfaces\IExecutionEngineFacade.cs" />
-    <Compile Include="ResponseObject.cs" />
+    <Compile Include="ResponseObjects\ResponseObject.cs" />
     <Compile Include="Interfaces\ISlaveManager.cs" />
     <Compile Include="Interfaces\IJobManager.cs" />
@@ -147 +147 @@
     <Compile Include="Interfaces\ISlaveCommunicator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Response.cs" />
-    <Compile Include="ResponseHeartBeat.cs" />
-    <Compile Include="ResponseList.cs" />
-    <Compile Include="ResponseResultReceived.cs" />
+    <Compile Include="ResponseObjects\Response.cs" />
+    <Compile Include="ResponseObjects\ResponseHeartBeat.cs" />
+    <Compile Include="ResponseObjects\ResponseList.cs" />
+    <Compile Include="ResponseObjects\ResponseResultReceived.cs" />
+    <Compile Include="ResponseStatus.cs" />
     <Compile Include="StreamedObject.cs" />
     <Compile Include="WcfSettings.cs" />
@@ -157 +158 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="HiveServerMessages.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

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

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {
@@ -43 +44 @@
     ResponseObject<JobDto> GetJobById(Guid jobId);
     [OperationContract]
-    ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
+    ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds);
   }
 }

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

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {
@@ -49 +50 @@
     ResponseObject<JobDto> AddNewJob(SerializedJob job);
 
-    [OperationContract]
-    Response RemoveJob(Guid jobId);
+    //[OperationContract]
+    //Response RemoveJob(Guid jobId);
+
+    //[OperationContract]
+    //ResponseObject<JobDto> GetLastJobResultOf(Guid jobId);
 
     [OperationContract]
-    ResponseObject<JobDto> GetLastJobResultOf(Guid jobId);
+    ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot);
 
     [OperationContract]
-    ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot);
-
-    [OperationContract]
-    ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
+    ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds);
 
     [OperationContract]

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

@@ -26 +26 @@
 using System.ServiceModel;
 using System.Runtime.Serialization;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {

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

@@ -27 +27 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {
@@ -57 +58 @@
 
     [OperationContract]
-    ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList);
+    ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList);
 
     [OperationContract]

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

@@ -27 +27 @@
 using System.IO;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {
@@ -32 +33 @@
   public interface ISlaveFacade: ISlaveCommunicator {
     [OperationContract]
-    Stream SendStreamedJob(Guid clientId);
+    Stream GetStreamedJob(Guid clientId);
 
     [OperationContract]
-    Stream SendStreamedPlugins(List<HivePluginInfoDto> pluginList);
+    Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList);
 
     [OperationContract]

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

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Contracts.Interfaces {
@@ -35 +36 @@
 
     [OperationContract]
-    ResponseList<ClientDto> GetAllClients();
+    ResponseList<ClientDto> GetAllSlaves();
 
     [OperationContract]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.cs

@@ -38 +38 @@
         Content_JobStateChanged(this, EventArgs.Empty);
         if (Content.LatestSnapshot != null) {
-          snapshotStatusText.InvokeIfRequired(c => c.Text = Content.LatestSnapshot.StatusMessage);
+          snapshotStatusText.InvokeIfRequired(c => c.Text = Content.LatestSnapshot.StatusMessage.ToString());
           snapshotTimeText.InvokeIfRequired(c => { c.Text = Content.LatestSnapshotTime.ToString(); });
         }
@@ -91 +91 @@
       } else {
         if (Content.LatestSnapshot != null) {
-          snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage;
+          snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage.ToString();
           snapshotTimeText.Text = Content.LatestSnapshotTime.ToString();
         } else {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -42 +42 @@
 using System.Collections;
 using System.ServiceModel;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Experiment {
@@ -561 +562 @@
               LogMessage("Polling results for " + jobIdsToQuery.Count() + " jobs");
               try {
-                ResponseObject<JobResultList> response = executionEngineFacade.GetAllJobResults(jobIdsToQuery);
-                if (response.Success) {
+                ResponseObject<JobResultList> response = executionEngineFacade.GetJobResults(jobIdsToQuery);
+                if (response.StatusMessage == ResponseStatus.Ok) {
                   JobResultList jobItemList = response.Obj;
                   UpdateJobItems(jobItemList);
 
                   LogMessage("Polling successfully finished");
+                } else {
+                  throw new Exception(response.StatusMessage.ToString());
                 }
               } catch (Exception e) {
@@ -603 +606 @@
 
         Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
-        if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
+        if (snapShotResponse.StatusMessage == ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated) {
           // job already finished
           Logger.Debug("HiveExperiment: Abort - GetLastResult(false)");
           response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
-          Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+          Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
         } else {
           // server sent snapshot request to client
@@ -615 +618 @@
             Logger.Debug("HiveExperiment: Abort - GetLastResult(true)");
             response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
-            Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+            Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
             retryCount++;
             // loop while
@@ -622 +625 @@
           } while (
             (retryCount < maxSnapshotRetries) && (
-            !response.Success ||
-            response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
+            response.StatusMessage == ResponseStatus.GetLastSerializedResult_JobResultNotYetThere)
             );
         }
-        if (response.Success) {
+        if (response.StatusMessage == ResponseStatus.Ok) {
           LogMessage(jobId, "Snapshot polling successfull for job " + jobId);
           UpdateSnapshot(response);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

@@ -11 +11 @@
 using System.Diagnostics;
 using HeuristicLab.Optimization;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Experiment {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

@@ -34 +34 @@
 using HeuristicLab.Core;
 using System.ServiceModel;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/CgCalendar.cs

@@ -13 +13 @@
 using HeuristicLab.Hive.Contracts;
 using System.Collections;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -55 +56 @@
       onlineTimes.Clear();
       ResponseList<AppointmentDto> response = ServiceLocator.GetClientManager().GetUptimeCalendarForResource(ResourceId);
-      if(response.Success) {
+      if(response.StatusMessage == ResponseStatus.Ok) {
         foreach (AppointmentDto appointmentDto in response.List) {
           onlineTimes.Add(new Appointment {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs

@@ -35 +35 @@
 using System.Threading;
 using System.ServiceModel;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -92 +93 @@
           t.Abort();
           this.Cursor = Cursors.Default;
-          if (resp.Success == true) return true;
-          lblError.Text = resp.StatusMessage;
+          if (resp.StatusMessage == ResponseStatus.Ok) return true;
+          lblError.Text = resp.StatusMessage.ToString();
           MessageBox.Show("Wrong username or password");
         }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

@@ -34 +34 @@
 using System.ServiceModel;
 using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -280 +281 @@
 
     private void updaterWoker_DoWork(object sender, DoWorkEventArgs e) {
-
       changes.Clear();
 
@@ -412 +412 @@
       ResponseObject<JobDto> response = ServiceLocator.GetJobManager().GetJobByIdWithDetails(currentJob.Id);
 
-      if(response.Success == false || response.Obj == null)
+      if(response.StatusMessage != ResponseStatus.Ok || response.Obj == null)
         return;
 
@@ -702 +702 @@
         ResponseObject<ClientGroupDto> respcg = clientManager.AddClientGroup(cg);
         Response res = clientManager.AddResourceToGroup(parentgroup, respcg.Obj);
-        if (res != null && !res.Success) {
-          MessageBox.Show(res.StatusMessage, "Error adding Group", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        if (res != null && res.StatusMessage != ResponseStatus.Ok) {
+          MessageBox.Show(res.StatusMessage.ToString(), "Error adding Group", MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
       } else {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs

@@ -9 +9 @@
 using System.Threading;
 using HeuristicLab.Hive.Contracts.Interfaces;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -87 +88 @@
       for (int i = 0; i < pollStatesCopy.Length; i++) {
         ResponseList<JobDto> resList = jobManager.GetAllJobsWithFilter(pollStatesCopy[i], CurrentPage * NrOfEntriesOnPage, NrOfEntriesOnPage);
-        if (resList.Success) {
+        if (resList.StatusMessage == ResponseStatus.Ok) {
           if (resList.List.Count == 0) {
             if (CurrentPage > 0) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Authorization/HivePermissionManager.cs

@@ -11 +11 @@
 using HeuristicLab.Hive.Server.Core.InternalInterfaces;
 using System.ServiceModel;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -31 +31 @@
         using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
           ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
-          LinkedList<JobDto> allOfflineJobsForSlave =
-            new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
+          LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
           if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
             jobToCalculate = allOfflineJobsForSlave.First.Value;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs

@@ -28 +28 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Server.DataAccess;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -60 +61 @@
     public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
       using (contextFactory.GetContext(false)) {
-        return jobManager.GetLastSerializedJobResultOf(jobId, requested, snapshot);
+        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
       }
     }
@@ -77 +78 @@
 
 
-    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
-        return jobManager.GetAllJobResults(jobIds);
+        return jobManager.GetJobResults(jobIds);
       }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -31 +31 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Server.DataAccess;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 
@@ -53 +54 @@
       sessionID = secMan.Login(username, password);
       if (sessionID == Guid.Empty) {
-        resp.Success = false;
-        resp.StatusMessage = ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_FAILED;
-      } else {
-        resp.Success = true;
-        resp.StatusMessage =
-          ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS;
+        resp.StatusMessage = ResponseStatus.Login_LoginFaild;
       }
       return resp;
@@ -64 +60 @@
 
 
-    public ResponseList<ClientDto> GetAllClients() {
+    public ResponseList<ClientDto> GetAllSlaves() {
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessClients", sessionID, Guid.Empty);
-        return slaveManager.GetAllClients();
+        return slaveManager.GetAllSlaves();
       }
     }
@@ -140 +136 @@
     }
 
-    public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
+    //public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
+    //  using (contextFactory.GetContext(false)) {
+    //    secMan.Authorize("AccessJobResults", sessionID, jobId);
+    //    return jobManager.GetLastJobResultOf(jobId);
+    //  }
+    //}
+
+    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessJobResults", sessionID, jobId);
-        return jobManager.GetLastJobResultOf(jobId);
-      }
-    }
-
-    public ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
-      using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobResults", sessionID, jobId);
-        return jobManager.GetLastSerializedJobResultOf(jobId, requested, snapshot);
-      }
-    }
-
-    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
+      }
+    }
+
+    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
         //secMan.Authorize("AccessJobResults", sessionID, jobId); skip authorization
-        return jobManager.GetAllJobResults(jobIds);
-      }
-    }
-
-    public Response RemoveJob(Guid jobId) {
-      using (contextFactory.GetContext()) {
-        secMan.Authorize("RemoveJob", sessionID, jobId);
-        return jobManager.RemoveJob(jobId);
-      }
-    }
+        return jobManager.GetJobResults(jobIds);
+      }
+    }
+
+    //public Response RemoveJob(Guid jobId) {
+    //  using (contextFactory.GetContext()) {
+    //    secMan.Authorize("RemoveJob", sessionID, jobId);
+    //    return jobManager.RemoveJob(jobId);
+    //  }
+    //}
 
     public Response RequestSnapshot(Guid jobId) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

@@ -35 +35 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using HeuristicLab.Hive.Server.DataAccess;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -85 +86 @@
     }
 
-    public ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList) {
-      return slaveCommunicator.SendPlugins(pluginList);      
+    public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
+      return slaveCommunicator.GetPlugins(pluginList);      
     }
 
@@ -94 +95 @@
       }
     }
-
 
     public ResponseCalendar GetCalendar(Guid clientId) {
@@ -114 +114 @@
     /// Do not use automatic transactions here
     /// </summary>
-    public Stream SendStreamedJob(Guid clientId) {
+    public Stream GetStreamedJob(Guid clientId) {
       using (contextFactory.GetContext(false)) {
         MultiStream stream = new MultiStream();
@@ -125 +125 @@
         stream.AddStream(new StreamedObject<ResponseObject<JobDto>>(job));
 
-        IJobManager jobManager = ServiceLocator.GetJobManager();
-        IInternalJobManager internalJobManager = (IInternalJobManager)jobManager;
+        IInternalJobManager internalJobManager = (IInternalJobManager)ServiceLocator.GetJobManager();
 
         //second stream the job binary data
         MemoryStream memoryStream = new MemoryStream();
-        if (job.Obj != null)
+        if (job.Obj != null) {
           stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Obj.Id)));
+        }
 
         OperationContext clientContext = OperationContext.Current;
@@ -144 +144 @@
     }
 
-    public Stream SendStreamedPlugins(List<HivePluginInfoDto> pluginList) {
-      return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.SendPlugins(pluginList));
+    public Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList) {
+      return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.GetPlugins(pluginList));
     }
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IInternalSlaveCommunicator.cs

@@ -27 +27 @@
 using HeuristicLab.Hive.Contracts;
 using System.IO;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core.InternalInterfaces {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -38 +38 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using IsolationLevel = System.Transactions.IsolationLevel;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -50 +51 @@
       lifecycleManager.RegisterStartup(new EventHandler(lifecycleManager_OnStartup));
       lifecycleManager.RegisterShutdown(new EventHandler(lifecycleManager_OnShutdown));
-    }
-
-    private JobDto GetLastJobResult(Guid jobId) {
-      return DaoLocator.JobDao.FindById(jobId);
     }
 
@@ -85 +82 @@
     public ResponseList<JobDto> GetAllJobs() {
       ResponseList<JobDto> response = new ResponseList<JobDto>();
-
       response.List = new List<JobDto>(DaoLocator.JobDao.FindAll());
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
-
       return response;
     }
@@ -96 +89 @@
       ResponseList<JobDto> response = new ResponseList<JobDto>();
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
-      response.Success = true;
       return response;
     }
@@ -118 +110 @@
       response.Obj = DaoLocator.JobDao.FindById(jobId);
       if (response.Obj != null) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
+        response.StatusMessage = ResponseStatus.Ok;
       } else {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+        response.StatusMessage = ResponseStatus.GetJobById_JobDoesNotExist;
       }
 
@@ -135 +125 @@
       job.Obj = DaoLocator.JobDao.FindById(jobId);
       if (job.Obj != null) {
-        job.Success = true;
-        job.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
+        job.StatusMessage = ResponseStatus.Ok;
 
         job.Obj.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
       } else {
-        job.Success = false;
-        job.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+        job.StatusMessage = ResponseStatus.GetJobByIdWithDetails_JobDoesNotExist;
       }
       return job;
@@ -166 +154 @@
       if (job != null && job.JobInfo != null) {
         if (job.JobInfo.State != State.Offline) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
+          response.StatusMessage = ResponseStatus.AddNewJob_JobStateMustBeOffline;
           return response;
         }
         if (job.JobInfo.Id != Guid.Empty) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
+          response.StatusMessage = ResponseStatus.AddNewJob_JobIdMustNotBeSet;
           return response;
         }
         if (job.SerializedJobData == null) {
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
-          response.Success = false;
+          response.StatusMessage = ResponseStatus.AddNewJob_JobNull;
           return response;
         }
@@ -185 +170 @@
         DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
 
-        response.Success = true;
         response.Obj = job.JobInfo;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
       } else {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
+        response.StatusMessage = ResponseStatus.AddNewJob_JobNull;
       }
 
@@ -198 +180 @@
     /// <summary>
     /// Removes a job from the database
+    /// 
+    /// [chn] this is currently not used anywhere -> check redundancy with AbortJob
     /// </summary>
     /// <param name="jobId"></param>
     /// <returns></returns>
-    public Response RemoveJob(Guid jobId) {
-      Response response = new Response();
-
-      JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (job == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-        return response;
-      }
-      DaoLocator.JobDao.Delete(job);
-      response.Success = false;
-      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_REMOVED;
-
-      return response;
-    }
-
-    public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
-      ResponseObject<JobDto> result = new ResponseObject<JobDto>();
-
-      result.Obj = GetLastJobResult(jobId);
-      result.Success = result.Obj != null;
-
-      return result;
-    }
+    //public Response RemoveJob(Guid jobId) {
+    //  Response response = new Response();
+
+    //  JobDto job = DaoLocator.JobDao.FindById(jobId);
+    //  if (job == null) {
+    //    response.StatusMessage = ResponseStatusMessage.RemoveJob_JobDoesNotExist;
+    //    return response;
+    //  }
+    //  DaoLocator.JobDao.Delete(job);
+
+    //  return response;
+    //}
+
+    ///
+    /// [chn] currently not used anywhere
+    /// 
+    //public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
+    //  ResponseObject<JobDto> result = new ResponseObject<JobDto>();
+
+    //  result.Obj = DaoLocator.JobDao.FindById(jobId);
+    //  if (result.Obj == null) {
+    //    result.StatusMessage = ResponseStatusMessage.
+    //  }
+
+    //  return result;
+    //}
 
     // [chn] [refactor] why does this method handle 3 different cases? wouldn't 3 methods be easier?
@@ -230 +216 @@
     // requested==true: resultat mit job
     // requested==false: 
-    public ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
+    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
       ResponseObject<SerializedJob> response = new ResponseObject<SerializedJob>();
 
@@ -237 +223 @@
       //if it's a snapshot but the result hasn't reached the server yet...
       if (snapshot && (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+        response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
         return response;
@@ -245 +230 @@
       //if it's NOT a snapshot, NEITHER request NOR is it finished
       if (!requested && !snapshot && job.State != State.Finished) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+        response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
         return response;
@@ -252 +236 @@
 
       //every other case - snapshot, job finished or it's requested
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
       response.Obj = new SerializedJob();
       response.Obj.JobInfo = job;
@@ -267 +249 @@
       JobDto job = DaoLocator.JobDao.FindById(jobId);
       if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
+        response.StatusMessage = ResponseStatus.RequestSnapshot_SnapshotAlreadyRequested;
         return response;
       }
       if (job.State != State.Calculating) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
+        response.StatusMessage = ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated;
         return response;
       }
@@ -280 +260 @@
       DaoLocator.JobDao.Update(job);
 
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_SET;
-
-      return response;
-    }
-
+      return response;
+    }
+
+    /// <summary>
+    /// [chn] rename to RequestAbortJob?
+    /// </summary>
     public Response AbortJob(Guid jobId) {
       Response response = new Response();
@@ -291 +271 @@
       JobDto job = DaoLocator.JobDao.FindById(jobId);
       if (job == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.AbortJob_JobDoesNotExist;
         return response; // no commit needed
       }
       if (job.State == State.Abort) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
+        //response.Success = true;
+        response.StatusMessage = ResponseStatus.AbortJob_AbortAlreadyRequested;
         return response; // no commit needed
       }
       if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.AbortJob_JobIsNotBeeingCalculated;
         return response; // no commit needed
       }
@@ -309 +289 @@
       DaoLocator.JobDao.Update(job);
 
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_SET;
-
       return response;
     }
@@ -320 +297 @@
     /// <param name="jobIds"></param>
     /// <returns></returns>
-    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       ResponseObject<JobResultList> response = new ResponseObject<JobResultList>();
       JobResultList jobResultList = new JobResultList();
@@ -335 +312 @@
       }
       response.Obj = jobResultList;
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
       return response;
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -168 +169 @@
     /// A hearbeat entry is created as well (login is the first hearbeat)
     /// </summary>
-    /// <param name="clientInfo"></param>
+    /// <param name="slaveInfo"></param>
     /// <returns></returns>
-    public Response Login(ClientDto clientInfo) {
+    public Response Login(ClientDto slaveInfo) {
       Response response = new Response();
 
       heartbeatLock.EnterWriteLock();
-      if (lastHeartbeats.ContainsKey(clientInfo.Id)) {
-        lastHeartbeats[clientInfo.Id] = DateTime.Now;
+      if (lastHeartbeats.ContainsKey(slaveInfo.Id)) {
+        lastHeartbeats[slaveInfo.Id] = DateTime.Now;
       } else {
-        lastHeartbeats.Add(clientInfo.Id, DateTime.Now);
+        lastHeartbeats.Add(slaveInfo.Id, DateTime.Now);
       }
       heartbeatLock.ExitWriteLock();
 
-      ClientDto dbClient = DaoLocator.ClientDao.FindById(clientInfo.Id);
+      ClientDto dbClient = DaoLocator.ClientDao.FindById(slaveInfo.Id);
 
       //Really set offline? 
       //Reconnect issues with the currently calculating jobs
-      clientInfo.State = State.Idle;
-      clientInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
+      slaveInfo.State = State.Idle;
+      slaveInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
 
       if (dbClient == null)
-        DaoLocator.ClientDao.Insert(clientInfo);
+        DaoLocator.ClientDao.Insert(slaveInfo);
       else
-        DaoLocator.ClientDao.Update(clientInfo);
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_SUCCESS;
+        DaoLocator.ClientDao.Update(slaveInfo);
+
       return response;
     }
@@ -202 +202 @@
       ClientDto client = DaoLocator.ClientDao.FindById(clientId);
       if (client == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.GetCalendar_ResourceNotFound;
         return response;
       }
@@ -211 +211 @@
       IEnumerable<AppointmentDto> appointments = DaoLocator.UptimeCalendarDao.GetCalendarForClient(client);
       if (appointments.Count() == 0) {
-        response.StatusMessage = ApplicationConstants.RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND;
-        response.Success = false;
+        response.StatusMessage = ResponseStatus.GetCalendar_NoCalendarFound;
+        //response.Success = false;
       } else {
-        response.Success = true;
+        //response.Success = true;
         response.Appointments = appointments;
       }
@@ -227 +227 @@
       ClientDto client = DaoLocator.ClientDao.FindById(clientId);
       if (client == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.GetCalendar_ResourceNotFound;
         return response;
       }
@@ -234 +234 @@
       client.CalendarSyncStatus = state;
       DaoLocator.ClientDao.Update(client);
-
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_UPTIMECALENDAR_STATUS_UPDATED;
 
       return response;
@@ -259 +256 @@
       // check if the client is logged in
       if (client.State == State.Offline || client.State == State.NullState) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN;
+        // response.Success = false;
+        response.StatusMessage = ResponseStatus.ProcessHeartBeat_UserNotLoggedIn;
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
 
@@ -288 +285 @@
       //check if new Cal must be loaded
       if (client.CalendarSyncStatus == CalendarState.Fetch || client.CalendarSyncStatus == CalendarState.ForceFetch) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR;
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchOrForceFetchCalendar));
 
@@ -306 +301 @@
       }
       Logger.Debug(" END Looked for Client Jobs");
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED;
 
       DaoLocator.ClientDao.Update(client);
@@ -347 +340 @@
       if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {
         if (jobsOfClient == null || jobsOfClient.Count == 0) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+          //response.Success = false;
+          //response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
 
           foreach (Guid jobId in hbData.JobProgress.Keys) {
@@ -362 +355 @@
           curJob.Client = DaoLocator.ClientDao.GetClientForJob(curJob.Id);
           if (curJob.Client == null || curJob.Client.Id != hbData.SlaveId) {
-            response.Success = false;
-            response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+            //response.Success = false;
+            //response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
             Logger.Error("There is no job calculated by this user " + hbData.SlaveId + " Job: " + curJob);
@@ -439 +432 @@
         response.Obj = job2Calculate;
         response.Obj.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Obj);
-        response.Success = true;
+
         Logger.Info("Job pulled: " + job2Calculate + " for user " + clientId);
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
         lock (newAssignedJobs) {
           if (!newAssignedJobs.ContainsKey(job2Calculate.Id))
@@ -447 +439 @@
         }
       } else {
-        response.Success = false;
+        //response.Success = false;
         response.Obj = null;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
+        response.StatusMessage = ResponseStatus.GetJob_NoJobsAvailable;
         Logger.Info("No more Jobs left for " + clientId);
       }
@@ -473 +465 @@
       ResponseResultReceived response = ProcessJobResult(result.ClientId, result.JobId, new byte[] { }, result.Percentage, result.Exception, finished);
 
-      if (response.Success) {
+      if (response.StatusMessage == ResponseStatus.Ok) {
         Logger.Debug("Trying to aquire WCF Job Stream");
         //jobStream = DaoLocator.JobDao.GetSerializedJobStream(result.JobId);
@@ -500 +492 @@
     }
 
-
-    private ResponseResultReceived ProcessJobResult(Guid clientId,
-      Guid jobId,
-      byte[] result,
-      double? percentage,
-      string exception,
-      bool finished) {
-
+    private ResponseResultReceived ProcessJobResult(Guid clientId, Guid jobId, byte[] result, double? percentage, string exception, bool finished) {
       Logger.Info("BEGIN Job received for Storage - SUB method: " + jobId);
 
@@ -521 +506 @@
         }
       }
-      
+
       if (job != null && job.JobInfo == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.ProcessJobResult_JobDoesNotExist;
         response.JobId = jobId;
         Logger.Error("No job with Id " + jobId);
@@ -532 +517 @@
       }
       if (job.JobInfo.State == State.Abort) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.ProcessJobResult_JobAborted;
 
         Logger.Error("Job was aborted! " + job.JobInfo);
@@ -541 +526 @@
       }
       if (job.JobInfo.Client == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.ProcessJobResult_JobIsNotBeeingCalculated;
         response.JobId = jobId;
 
@@ -551 +536 @@
       }
       if (job.JobInfo.Client.Id != clientId) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.ProcessJobResult_WrongClientForJob;
         response.JobId = jobId;
 
@@ -561 +546 @@
       }
       if (job.JobInfo.State == State.Finished) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
+        response.StatusMessage = ResponseStatus.Ok;
         response.JobId = jobId;
 
@@ -574 +558 @@
         job.JobInfo.State = State.Calculating;
       }
-      if (job.JobInfo.State != State.Calculating &&
-        job.JobInfo.State != State.Pending) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
+      if (job.JobInfo.State != State.Calculating && job.JobInfo.State != State.Pending) {
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.ProcessJobResult_InvalidJobState;
         response.JobId = jobId;
 
@@ -600 +583 @@
       DaoLocator.JobDao.Update(job.JobInfo);
 
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
+      response.StatusMessage = ResponseStatus.Ok;
       response.JobId = jobId;
       response.Finished = finished;
@@ -652 +634 @@
       ClientDto client = DaoLocator.ClientDao.FindById(clientId);
       if (client == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.Logout_SlaveNotRegistered;
         return response;
       }
@@ -668 +650 @@
       DaoLocator.ClientDao.Update(client);
 
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS;
-
       return response;
     }
@@ -684 +663 @@
       JobDto job = DaoLocator.JobDao.FindById(jobId);
       if (job == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.IsJobStillNeeded_JobDoesNotExist;
         Logger.Error("Job doesn't exist (anymore)! " + jobId);
         return response;
       }
       if (job.State == State.Finished) {
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED;
+        //response.Success = true;
+        response.StatusMessage = ResponseStatus.IsJobStillNeeded_JobAlreadyFinished;
         Logger.Error("already finished! " + job);
         return response;
@@ -702 +681 @@
       DaoLocator.JobDao.Update(job);
 
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT;
-      return response;
-    }
-
-    public ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList) {
+      return response;
+    }
+
+    public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
       ResponseList<CachedHivePluginInfoDto> response = new ResponseList<CachedHivePluginInfoDto>();
+      response.List = new List<CachedHivePluginInfoDto>();
       foreach (HivePluginInfoDto pluginInfo in pluginList) {
         if (pluginInfo.Update) {
           //check if there is a newer version         
-          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();
+          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();
           if (ipd != null) {
-            response.List.Add(convertPluginDescriptorToDto(ipd));
+            response.List.Add(ConvertPluginDescriptorToDto(ipd));
           }
         } else {
-          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();
+          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();
           if (ipd != null) {
-            response.List.Add(convertPluginDescriptorToDto(ipd));
+            response.List.Add(ConvertPluginDescriptorToDto(ipd));
           } else {
-            response.Success = false;
-            response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL;
+            //response.Success = false;
+            response.StatusMessage = ResponseStatus.GetPlugins_PluginsNotAvailable;
             return response;
           }
         }
       }
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_PLUGINS_SENT;
-
-      return response;
-    }
-
-    private CachedHivePluginInfoDto convertPluginDescriptorToDto(IPluginDescription currPlugin) {
+      return response;
+    }
+
+    private CachedHivePluginInfoDto ConvertPluginDescriptorToDto(IPluginDescription currPlugin) {
       CachedHivePluginInfoDto currCachedPlugin = new CachedHivePluginInfoDto {
         Name = currPlugin.Name,

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs

@@ -33 +33 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using ClientGroup=HeuristicLab.Hive.Contracts.BusinessObjects.ClientGroupDto;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -48 +49 @@
     /// </summary>
     /// <returns></returns>
-    public ResponseList<ClientDto> GetAllClients() {
+    public ResponseList<ClientDto> GetAllSlaves() {
       ResponseList<ClientDto> response = new ResponseList<ClientDto>();
-
       response.List = new List<ClientDto>(DaoLocator.ClientDao.FindAll());
-      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTS;
-      response.Success = true;
-
       return response;
     }
@@ -65 +62 @@
       ResponseList<ClientGroup> response = new ResponseList<ClientGroup>();
 
-      List<ClientGroup> allClientGroups =
-        new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
+      List<ClientGroup> allClientGroups = new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
       ClientGroup emptyClientGroup = new ClientGroup();
       IEnumerable<ClientDto> groupLessClients = DaoLocator.ClientDao.FindAllClientsWithoutGroup();
@@ -78 +74 @@
 
       response.List = allClientGroups;
-      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS;
-      response.Success = true;
 
       return response;
     }
 
+    /// <summary>
+    /// [chn] check usage 
+    /// </summary>
     public ResponseList<UpTimeStatisticsDto> GetAllUpTimeStatistics() {
-      ResponseList<UpTimeStatisticsDto> response = new ResponseList<UpTimeStatisticsDto>();
-      response.Success = true;
-      return response;
+      return new ResponseList<UpTimeStatisticsDto>();
     }
 
@@ -99 +94 @@
 
       if (clientGroup.Id != Guid.Empty) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_ID_MUST_NOT_BE_SET;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.AddClientGroup_SlaveIdMustNotBeSet;
       }
       else {
@@ -106 +101 @@
         //clientGroupAdapter.Update(clientGroup);
         response.Obj = clientGroup;
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_ADDED;
       }
 
@@ -124 +117 @@
       ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
       if (clientGroup == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.AddResourceToGroup_SlaveGroupDoesNotExist;
         return response;
       }
@@ -138 +131 @@
         DaoLocator.ClientDao.SetServerSideCalendar(dbr, clientGroup.Id);  
       }
-
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP;
 
       return response;
@@ -156 +146 @@
       ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
       if (clientGroup == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
+        // response.Success = false;
+        response.StatusMessage = ResponseStatus.AddResourceToGroup_SlaveGroupDoesNotExist;
         return response;
       }
      
       DaoLocator.ClientGroupDao.RemoveRessourceFromClientGroup(resourceId, clientGroup.Id);
-      
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_REMOVED;
       return response;                
     }
@@ -175 +162 @@
         ClientGroupDtoList groupsOfClient = new ClientGroupDtoList(DaoLocator.ClientGroupDao.MemberOf(client));
         response.Obj = groupsOfClient;
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT;
-      }
-      else {
+      } else {
         response.Obj = new ClientGroupDtoList();
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
+        //response.Success = false;
+        response.StatusMessage = ResponseStatus.GetAllGroupsOfResource_ResourceNotFound;
       }
 
@@ -192 +176 @@
       ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
       if (clientGroup == null) {
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
+        response.StatusMessage = ResponseStatus.DeleteClientGroup_SlaveGroupDoesNotExist;
         return response;
       }
 
       DaoLocator.ClientGroupDao.Delete(clientGroup);
-
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DELETED;
       return response;
     }
@@ -207 +187 @@
       ResponseList<AppointmentDto> response = new ResponseList<AppointmentDto>();
       response.List = new List<AppointmentDto>(DaoLocator.UptimeCalendarDao.GetUptimeCalendarForResource(guid));
-      response.Success = true;
       return response;
     }
@@ -214 +193 @@
       DaoLocator.UptimeCalendarDao.SetUptimeCalendarForResource(guid, appointments);
       DaoLocator.UptimeCalendarDao.NotifyClientsOfNewCalendar(guid, isForced);
-      return new Response {Success = true};
+      return new Response();
     }
     #endregion

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

@@ -125 +125 @@
     <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.JobDto.datasource" />
     <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseHeartBeat.datasource" />
+    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.Response.datasource" />
+    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar.datasource" />
+    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat.datasource" />
+    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived.datasource" />
     <None Include="Properties\DataSources\HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto.datasource" />
     <None Include="Service References\ServerService\Arrays1.xsd">
@@ -133 +137 @@
     </None>
     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.ResponseObjects.xsd">
       <SubType>Designer</SubType>
     </None>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd

@@ -2 +2 @@
 <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">
   <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" />
-  <xs:complexType name="Response">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="StatusMessage" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="Success" type="xs:boolean" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="Response" nillable="true" type="tns:Response" />
-  <xs:complexType name="ResponseHeartBeat">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:Response">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="ActionRequest" nillable="true" type="tns:ArrayOfMessageContainer" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="ResponseHeartBeat" nillable="true" type="tns:ResponseHeartBeat" />
+  <xs:simpleType name="ResponseStatus">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Ok" />
+      <xs:enumeration value="RequestSnapshot_JobIsNotBeeingCalculated" />
+      <xs:enumeration value="RequestSnapshot_SnapshotAlreadyRequested" />
+      <xs:enumeration value="GetJobById_JobDoesNotExist" />
+      <xs:enumeration value="GetJobByIdWithDetails_JobDoesNotExist" />
+      <xs:enumeration value="AddNewJob_JobStateMustBeOffline" />
+      <xs:enumeration value="AddNewJob_JobIdMustNotBeSet" />
+      <xs:enumeration value="AddNewJob_JobNull" />
+      <xs:enumeration value="RemoveJob_JobDoesNotExist" />
+      <xs:enumeration value="GetLastSerializedResult_JobResultNotYetThere" />
+      <xs:enumeration value="AbortJob_JobDoesNotExist" />
+      <xs:enumeration value="AbortJob_AbortAlreadyRequested" />
+      <xs:enumeration value="AbortJob_JobIsNotBeeingCalculated" />
+      <xs:enumeration value="GetCalendar_ResourceNotFound" />
+      <xs:enumeration value="GetCalendar_NoCalendarFound" />
+      <xs:enumeration value="SetCalendarStatus_ResourceNotFound" />
+      <xs:enumeration value="ProcessHeartBeat_UserNotLoggedIn" />
+      <xs:enumeration value="GetJob_NoJobsAvailable" />
+      <xs:enumeration value="ProcessJobResult_JobDoesNotExist" />
+      <xs:enumeration value="ProcessJobResult_JobAborted" />
+      <xs:enumeration value="ProcessJobResult_JobIsNotBeeingCalculated" />
+      <xs:enumeration value="ProcessJobResult_WrongClientForJob" />
+      <xs:enumeration value="ProcessJobResult_InvalidJobState" />
+      <xs:enumeration value="Login_LoginFaild" />
+      <xs:enumeration value="Logout_SlaveNotRegistered" />
+      <xs:enumeration value="IsJobStillNeeded_JobDoesNotExist" />
+      <xs:enumeration value="IsJobStillNeeded_JobAlreadyFinished" />
+      <xs:enumeration value="GetPlugins_PluginsNotAvailable" />
+      <xs:enumeration value="AddClientGroup_SlaveIdMustNotBeSet" />
+      <xs:enumeration value="AddResourceToGroup_SlaveGroupDoesNotExist" />
+      <xs:enumeration value="DeleteResourceFromGroup_SlaveGroupDoesNotExist" />
+      <xs:enumeration value="GetAllGroupsOfResource_ResourceNotFound" />
+      <xs:enumeration value="DeleteClientGroup_SlaveGroupDoesNotExist" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="ResponseStatus" nillable="true" type="tns:ResponseStatus" />
   <xs:complexType name="ArrayOfMessageContainer">
     <xs:sequence>
@@ -50 +69 @@
   </xs:simpleType>
   <xs:element name="MessageContainer.MessageType" nillable="true" type="tns:MessageContainer.MessageType" />
-  <xs:complexType name="ResponseObjectOfJobDtoZAa7YIsz">
-    <xs:annotation>
-      <xs:appinfo>
-        <GenericType Name="ResponseObjectOf{0}{#}" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
-          <GenericParameter Name="JobDto" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects">
-          </GenericParameter>
-        </GenericType>
-      </xs:appinfo>
-    </xs:annotation>
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:Response">
-        <xs:sequence>
-          <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="Obj" nillable="true" type="q1:JobDto" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="ResponseObjectOfJobDtoZAa7YIsz" nillable="true" type="tns:ResponseObjectOfJobDtoZAa7YIsz" />
-  <xs:complexType name="ResponseResultReceived">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:Response">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="Finished" type="xs:boolean" />
-          <xs:element minOccurs="0" name="JobId" type="ser:guid" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="ResponseResultReceived" nillable="true" type="tns:ResponseResultReceived" />
-  <xs:complexType name="ResponseListOfCachedHivePluginInfoDtoZMwZop09">
-    <xs:annotation>
-      <xs:appinfo>
-        <GenericType Name="ResponseListOf{0}{#}" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
-          <GenericParameter Name="CachedHivePluginInfoDto" Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure">
-          </GenericParameter>
-        </GenericType>
-      </xs:appinfo>
-    </xs:annotation>
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:Response">
-        <xs:sequence>
-          <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="List" nillable="true" type="q2:ArrayOfCachedHivePluginInfoDto" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="ResponseListOfCachedHivePluginInfoDtoZMwZop09" nillable="true" type="tns:ResponseListOfCachedHivePluginInfoDtoZMwZop09" />
-  <xs:complexType name="ResponseCalendar">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:Response">
-        <xs:sequence>
-          <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="Appointments" nillable="true" type="q3:ArrayOfAppointmentDto" />
-          <xs:element minOccurs="0" name="ForceFetch" type="xs:boolean" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="ResponseCalendar" nillable="true" type="tns:ResponseCalendar" />
 </xs:schema>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.cs

@@ -17 +17 @@
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/Login", ReplyAction="http://tempuri.org/ISlaveCommunicator/LoginResponse")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
-        HeuristicLab.Hive.Contracts.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo);
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/Login", ReplyAction="http://tempuri.org/ISlaveCommunicator/LoginResponse")]
         System.IAsyncResult BeginLogin(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogin(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeatResponse")]
-        HeuristicLab.Hive.Contracts.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessHeartBeatResponse")]
         System.IAsyncResult BeginProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/GetJob", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetJobResponse")]
-        HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/GetJob", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetJobResponse")]
         System.IAsyncResult BeginGetJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResult", ReplyAction="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResultResponse")]
-        HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResult", ReplyAction="http://tempuri.org/ISlaveCommunicator/StoreFinishedJobResultResponse")]
         System.IAsyncResult BeginStoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/ProcessSnapshot", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessSnapshotResponse")]
-        HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/ProcessSnapshot", ReplyAction="http://tempuri.org/ISlaveCommunicator/ProcessSnapshotResponse")]
         System.IAsyncResult BeginProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/Logout", ReplyAction="http://tempuri.org/ISlaveCommunicator/LogoutResponse")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
-        HeuristicLab.Hive.Contracts.Response Logout(System.Guid clientId);
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response Logout(System.Guid clientId);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/Logout", ReplyAction="http://tempuri.org/ISlaveCommunicator/LogoutResponse")]
         System.IAsyncResult BeginLogout(System.Guid clientId, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.Response EndLogout(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogout(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/IsJobStillNeeded", ReplyAction="http://tempuri.org/ISlaveCommunicator/IsJobStillNeededResponse")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
-        HeuristicLab.Hive.Contracts.Response IsJobStillNeeded(System.Guid jobId);
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response IsJobStillNeeded(System.Guid jobId);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/IsJobStillNeeded", ReplyAction="http://tempuri.org/ISlaveCommunicator/IsJobStillNeededResponse")]
         System.IAsyncResult BeginIsJobStillNeeded(System.Guid jobId, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.Response EndIsJobStillNeeded(System.IAsyncResult result);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/SendPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/SendPluginsResponse")]
-        HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> SendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
-        
-        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/SendPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/SendPluginsResponse")]
-        System.IAsyncResult BeginSendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
-        
-        HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndSendPlugins(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndIsJobStillNeeded(System.IAsyncResult result);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/GetPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetPluginsResponse")]
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> GetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
+        
+        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/GetPlugins", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetPluginsResponse")]
+        System.IAsyncResult BeginGetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
+        
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndGetPlugins(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/GetCalendar", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetCalendarResponse")]
-        HeuristicLab.Hive.Contracts.ResponseCalendar GetCalendar(System.Guid clientId);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar GetCalendar(System.Guid clientId);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/GetCalendar", ReplyAction="http://tempuri.org/ISlaveCommunicator/GetCalendarResponse")]
         System.IAsyncResult BeginGetCalendar(System.Guid clientId, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseCalendar EndGetCalendar(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar EndGetCalendar(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveCommunicator/SetCalendarStatus", ReplyAction="http://tempuri.org/ISlaveCommunicator/SetCalendarStatusResponse")]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseHeartBeat))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseResultReceived))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseCalendar))]
-        HeuristicLab.Hive.Contracts.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state);
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar))]
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveCommunicator/SetCalendarStatus", ReplyAction="http://tempuri.org/ISlaveCommunicator/SetCalendarStatusResponse")]
         System.IAsyncResult BeginSetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.Response EndSetCalendarStatus(System.IAsyncResult result);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/SendStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedJobResponse")]
-        System.IO.Stream SendStreamedJob(System.Guid clientId);
-        
-        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/SendStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedJobResponse")]
-        System.IAsyncResult BeginSendStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
-        
-        System.IO.Stream EndSendStreamedJob(System.IAsyncResult result);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/SendStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedPluginsResponse")]
-        System.IO.Stream SendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
-        
-        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/SendStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/SendStreamedPluginsResponse")]
-        System.IAsyncResult BeginSendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
-        
-        System.IO.Stream EndSendStreamedPlugins(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.Response EndSetCalendarStatus(System.IAsyncResult result);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/GetStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedJobResponse")]
+        System.IO.Stream GetStreamedJob(System.Guid clientId);
+        
+        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/GetStreamedJob", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedJobResponse")]
+        System.IAsyncResult BeginGetStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
+        
+        System.IO.Stream EndGetStreamedJob(System.IAsyncResult result);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/GetStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedPluginsResponse")]
+        System.IO.Stream GetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList);
+        
+        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/GetStreamedPlugins", ReplyAction="http://tempuri.org/ISlaveFacade/GetStreamedPluginsResponse")]
+        System.IAsyncResult BeginGetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState);
+        
+        System.IO.Stream EndGetStreamedPlugins(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamedResponse")]
-        HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/StoreFinishedJobResultStreamedResponse")]
         System.IAsyncResult BeginStoreFinishedJobResultStreamed(System.IO.Stream stream, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamedResponse")]
-        HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamed", ReplyAction="http://tempuri.org/ISlaveFacade/ProcessSnapshotStreamedResponse")]
         System.IAsyncResult BeginProcessSnapshotStreamed(System.IO.Stream stream, System.AsyncCallback callback, object asyncState);
         
-        HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result);
+        HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result);
     }
     
@@ -164 +164 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
             }
         }
@@ -183 +183 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseHeartBeat Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseHeartBeat)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat)(this.results[0]));
             }
         }
@@ -202 +202 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto>)(this.results[0]));
             }
         }
@@ -221 +221 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
             }
         }
@@ -240 +240 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
             }
         }
@@ -259 +259 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
             }
         }
@@ -278 +278 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public partial class SendPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        public SendPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        public HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
+            }
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    public partial class GetPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        public GetPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto>)(this.results[0]));
             }
         }
@@ -316 +316 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseCalendar Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseCalendar)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar)(this.results[0]));
             }
         }
@@ -335 +335 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public partial class SendStreamedJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        public SendStreamedJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.Response)(this.results[0]));
+            }
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    public partial class GetStreamedJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        public GetStreamedJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
                 base(exception, cancelled, userState) {
             this.results = results;
@@ -364 +364 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public partial class SendStreamedPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        public SendStreamedPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    public partial class GetStreamedPluginsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        public GetStreamedPluginsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
                 base(exception, cancelled, userState) {
             this.results = results;
@@ -392 +392 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
             }
         }
@@ -411 +411 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
-            get {
-                base.RaiseExceptionIfNecessary();
-                return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived Result {
+            get {
+                base.RaiseExceptionIfNecessary();
+                return ((HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived)(this.results[0]));
             }
         }
@@ -465 +465 @@
         private System.Threading.SendOrPostCallback onIsJobStillNeededCompletedDelegate;
         
-        private BeginOperationDelegate onBeginSendPluginsDelegate;
-        
-        private EndOperationDelegate onEndSendPluginsDelegate;
-        
-        private System.Threading.SendOrPostCallback onSendPluginsCompletedDelegate;
+        private BeginOperationDelegate onBeginGetPluginsDelegate;
+        
+        private EndOperationDelegate onEndGetPluginsDelegate;
+        
+        private System.Threading.SendOrPostCallback onGetPluginsCompletedDelegate;
         
         private BeginOperationDelegate onBeginGetCalendarDelegate;
@@ -483 +483 @@
         private System.Threading.SendOrPostCallback onSetCalendarStatusCompletedDelegate;
         
-        private BeginOperationDelegate onBeginSendStreamedJobDelegate;
-        
-        private EndOperationDelegate onEndSendStreamedJobDelegate;
-        
-        private System.Threading.SendOrPostCallback onSendStreamedJobCompletedDelegate;
-        
-        private BeginOperationDelegate onBeginSendStreamedPluginsDelegate;
-        
-        private EndOperationDelegate onEndSendStreamedPluginsDelegate;
-        
-        private System.Threading.SendOrPostCallback onSendStreamedPluginsCompletedDelegate;
+        private BeginOperationDelegate onBeginGetStreamedJobDelegate;
+        
+        private EndOperationDelegate onEndGetStreamedJobDelegate;
+        
+        private System.Threading.SendOrPostCallback onGetStreamedJobCompletedDelegate;
+        
+        private BeginOperationDelegate onBeginGetStreamedPluginsDelegate;
+        
+        private EndOperationDelegate onEndGetStreamedPluginsDelegate;
+        
+        private System.Threading.SendOrPostCallback onGetStreamedPluginsCompletedDelegate;
         
         private BeginOperationDelegate onBeginStoreFinishedJobResultStreamedDelegate;
@@ -540 +540 @@
         public event System.EventHandler<IsJobStillNeededCompletedEventArgs> IsJobStillNeededCompleted;
         
-        public event System.EventHandler<SendPluginsCompletedEventArgs> SendPluginsCompleted;
+        public event System.EventHandler<GetPluginsCompletedEventArgs> GetPluginsCompleted;
         
         public event System.EventHandler<GetCalendarCompletedEventArgs> GetCalendarCompleted;
@@ -546 +546 @@
         public event System.EventHandler<SetCalendarStatusCompletedEventArgs> SetCalendarStatusCompleted;
         
-        public event System.EventHandler<SendStreamedJobCompletedEventArgs> SendStreamedJobCompleted;
-        
-        public event System.EventHandler<SendStreamedPluginsCompletedEventArgs> SendStreamedPluginsCompleted;
+        public event System.EventHandler<GetStreamedJobCompletedEventArgs> GetStreamedJobCompleted;
+        
+        public event System.EventHandler<GetStreamedPluginsCompletedEventArgs> GetStreamedPluginsCompleted;
         
         public event System.EventHandler<StoreFinishedJobResultStreamedCompletedEventArgs> StoreFinishedJobResultStreamedCompleted;
@@ -554 +554 @@
         public event System.EventHandler<ProcessSnapshotStreamedCompletedEventArgs> ProcessSnapshotStreamedCompleted;
         
-        public HeuristicLab.Hive.Contracts.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto clientInfo) {
             return base.Channel.Login(clientInfo);
         }
@@ -564 +564 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogin(System.IAsyncResult result) {
             return base.Channel.EndLogin(result);
         }
@@ -574 +574 @@
         
         private object[] OnEndLogin(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.Response retVal = this.EndLogin(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndLogin(result);
             return new object[] {
                     retVal};
@@ -604 +604 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
             return base.Channel.ProcessHeartBeat(hbData);
         }
@@ -614 +614 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat EndProcessHeartBeat(System.IAsyncResult result) {
             return base.Channel.EndProcessHeartBeat(result);
         }
@@ -624 +624 @@
         
         private object[] OnEndProcessHeartBeat(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseHeartBeat retVal = this.EndProcessHeartBeat(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseHeartBeat retVal = this.EndProcessHeartBeat(result);
             return new object[] {
                     retVal};
@@ -654 +654 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> GetJob(System.Guid clientId) {
             return base.Channel.GetJob(clientId);
         }
@@ -664 +664 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> EndGetJob(System.IAsyncResult result) {
             return base.Channel.EndGetJob(result);
         }
@@ -674 +674 @@
         
         private object[] OnEndGetJob(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> retVal = this.EndGetJob(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> retVal = this.EndGetJob(result);
             return new object[] {
                     retVal};
@@ -704 +704 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResult(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
             return base.Channel.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);
         }
@@ -714 +714 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResult(System.IAsyncResult result) {
             return base.Channel.EndStoreFinishedJobResult(result);
         }
@@ -728 +728 @@
         
         private object[] OnEndStoreFinishedJobResult(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndStoreFinishedJobResult(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndStoreFinishedJobResult(result);
             return new object[] {
                     retVal};
@@ -762 +762 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshot(System.Guid clientId, System.Guid jobId, byte[] result, double percentage, string exception) {
             return base.Channel.ProcessSnapshot(clientId, jobId, result, percentage, exception);
         }
@@ -772 +772 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshot(System.IAsyncResult result) {
             return base.Channel.EndProcessSnapshot(result);
         }
@@ -786 +786 @@
         
         private object[] OnEndProcessSnapshot(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndProcessSnapshot(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndProcessSnapshot(result);
             return new object[] {
                     retVal};
@@ -820 +820 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response Logout(System.Guid clientId) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response Logout(System.Guid clientId) {
             return base.Channel.Logout(clientId);
         }
@@ -830 +830 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.Response EndLogout(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndLogout(System.IAsyncResult result) {
             return base.Channel.EndLogout(result);
         }
@@ -840 +840 @@
         
         private object[] OnEndLogout(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.Response retVal = this.EndLogout(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndLogout(result);
             return new object[] {
                     retVal};
@@ -870 +870 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response IsJobStillNeeded(System.Guid jobId) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response IsJobStillNeeded(System.Guid jobId) {
             return base.Channel.IsJobStillNeeded(jobId);
         }
@@ -880 +880 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.Response EndIsJobStillNeeded(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndIsJobStillNeeded(System.IAsyncResult result) {
             return base.Channel.EndIsJobStillNeeded(result);
         }
@@ -890 +890 @@
         
         private object[] OnEndIsJobStillNeeded(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.Response retVal = this.EndIsJobStillNeeded(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndIsJobStillNeeded(result);
             return new object[] {
                     retVal};
@@ -920 +920 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> SendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
-            return base.Channel.SendPlugins(pluginList);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginSendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
-            return base.Channel.BeginSendPlugins(pluginList, callback, asyncState);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndSendPlugins(System.IAsyncResult result) {
-            return base.Channel.EndSendPlugins(result);
-        }
-        
-        private System.IAsyncResult OnBeginSendPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> GetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
+            return base.Channel.GetPlugins(pluginList);
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public System.IAsyncResult BeginGetPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
+            return base.Channel.BeginGetPlugins(pluginList, callback, asyncState);
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> EndGetPlugins(System.IAsyncResult result) {
+            return base.Channel.EndGetPlugins(result);
+        }
+        
+        private System.IAsyncResult OnBeginGetPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
             HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList = ((HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[])(inValues[0]));
-            return this.BeginSendPlugins(pluginList, callback, asyncState);
-        }
-        
-        private object[] OnEndSendPlugins(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> retVal = this.EndSendPlugins(result);
-            return new object[] {
-                    retVal};
-        }
-        
-        private void OnSendPluginsCompleted(object state) {
-            if ((this.SendPluginsCompleted != null)) {
-                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
-                this.SendPluginsCompleted(this, new SendPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
-            }
-        }
-        
-        public void SendPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
-            this.SendPluginsAsync(pluginList, null);
-        }
-        
-        public void SendPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
-            if ((this.onBeginSendPluginsDelegate == null)) {
-                this.onBeginSendPluginsDelegate = new BeginOperationDelegate(this.OnBeginSendPlugins);
-            }
-            if ((this.onEndSendPluginsDelegate == null)) {
-                this.onEndSendPluginsDelegate = new EndOperationDelegate(this.OnEndSendPlugins);
-            }
-            if ((this.onSendPluginsCompletedDelegate == null)) {
-                this.onSendPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendPluginsCompleted);
-            }
-            base.InvokeAsync(this.onBeginSendPluginsDelegate, new object[] {
-                        pluginList}, this.onEndSendPluginsDelegate, this.onSendPluginsCompletedDelegate, userState);
-        }
-        
-        public HeuristicLab.Hive.Contracts.ResponseCalendar GetCalendar(System.Guid clientId) {
+            return this.BeginGetPlugins(pluginList, callback, asyncState);
+        }
+        
+        private object[] OnEndGetPlugins(System.IAsyncResult result) {
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseList<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> retVal = this.EndGetPlugins(result);
+            return new object[] {
+                    retVal};
+        }
+        
+        private void OnGetPluginsCompleted(object state) {
+            if ((this.GetPluginsCompleted != null)) {
+                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+                this.GetPluginsCompleted(this, new GetPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+            }
+        }
+        
+        public void GetPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
+            this.GetPluginsAsync(pluginList, null);
+        }
+        
+        public void GetPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
+            if ((this.onBeginGetPluginsDelegate == null)) {
+                this.onBeginGetPluginsDelegate = new BeginOperationDelegate(this.OnBeginGetPlugins);
+            }
+            if ((this.onEndGetPluginsDelegate == null)) {
+                this.onEndGetPluginsDelegate = new EndOperationDelegate(this.OnEndGetPlugins);
+            }
+            if ((this.onGetPluginsCompletedDelegate == null)) {
+                this.onGetPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetPluginsCompleted);
+            }
+            base.InvokeAsync(this.onBeginGetPluginsDelegate, new object[] {
+                        pluginList}, this.onEndGetPluginsDelegate, this.onGetPluginsCompletedDelegate, userState);
+        }
+        
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar GetCalendar(System.Guid clientId) {
             return base.Channel.GetCalendar(clientId);
         }
@@ -980 +980 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseCalendar EndGetCalendar(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar EndGetCalendar(System.IAsyncResult result) {
             return base.Channel.EndGetCalendar(result);
         }
@@ -990 +990 @@
         
         private object[] OnEndGetCalendar(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseCalendar retVal = this.EndGetCalendar(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseCalendar retVal = this.EndGetCalendar(result);
             return new object[] {
                     retVal};
@@ -1020 +1020 @@
         }
         
-        public HeuristicLab.Hive.Contracts.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response SetCalendarStatus(System.Guid clientId, HeuristicLab.Hive.Contracts.BusinessObjects.CalendarState state) {
             return base.Channel.SetCalendarStatus(clientId, state);
         }
@@ -1030 +1030 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.Response EndSetCalendarStatus(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.Response EndSetCalendarStatus(System.IAsyncResult result) {
             return base.Channel.EndSetCalendarStatus(result);
         }
@@ -1041 +1041 @@
         
         private object[] OnEndSetCalendarStatus(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.Response retVal = this.EndSetCalendarStatus(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.Response retVal = this.EndSetCalendarStatus(result);
             return new object[] {
                     retVal};
@@ -1072 +1072 @@
         }
         
-        public System.IO.Stream SendStreamedJob(System.Guid clientId) {
-            return base.Channel.SendStreamedJob(clientId);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginSendStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
-            return base.Channel.BeginSendStreamedJob(clientId, callback, asyncState);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IO.Stream EndSendStreamedJob(System.IAsyncResult result) {
-            return base.Channel.EndSendStreamedJob(result);
-        }
-        
-        private System.IAsyncResult OnBeginSendStreamedJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
+        public System.IO.Stream GetStreamedJob(System.Guid clientId) {
+            return base.Channel.GetStreamedJob(clientId);
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public System.IAsyncResult BeginGetStreamedJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
+            return base.Channel.BeginGetStreamedJob(clientId, callback, asyncState);
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public System.IO.Stream EndGetStreamedJob(System.IAsyncResult result) {
+            return base.Channel.EndGetStreamedJob(result);
+        }
+        
+        private System.IAsyncResult OnBeginGetStreamedJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
             System.Guid clientId = ((System.Guid)(inValues[0]));
-            return this.BeginSendStreamedJob(clientId, callback, asyncState);
-        }
-        
-        private object[] OnEndSendStreamedJob(System.IAsyncResult result) {
-            System.IO.Stream retVal = this.EndSendStreamedJob(result);
-            return new object[] {
-                    retVal};
-        }
-        
-        private void OnSendStreamedJobCompleted(object state) {
-            if ((this.SendStreamedJobCompleted != null)) {
-                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
-                this.SendStreamedJobCompleted(this, new SendStreamedJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
-            }
-        }
-        
-        public void SendStreamedJobAsync(System.Guid clientId) {
-            this.SendStreamedJobAsync(clientId, null);
-        }
-        
-        public void SendStreamedJobAsync(System.Guid clientId, object userState) {
-            if ((this.onBeginSendStreamedJobDelegate == null)) {
-                this.onBeginSendStreamedJobDelegate = new BeginOperationDelegate(this.OnBeginSendStreamedJob);
-            }
-            if ((this.onEndSendStreamedJobDelegate == null)) {
-                this.onEndSendStreamedJobDelegate = new EndOperationDelegate(this.OnEndSendStreamedJob);
-            }
-            if ((this.onSendStreamedJobCompletedDelegate == null)) {
-                this.onSendStreamedJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendStreamedJobCompleted);
-            }
-            base.InvokeAsync(this.onBeginSendStreamedJobDelegate, new object[] {
-                        clientId}, this.onEndSendStreamedJobDelegate, this.onSendStreamedJobCompletedDelegate, userState);
-        }
-        
-        public System.IO.Stream SendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
-            return base.Channel.SendStreamedPlugins(pluginList);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginSendStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
-            return base.Channel.BeginSendStreamedPlugins(pluginList, callback, asyncState);
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IO.Stream EndSendStreamedPlugins(System.IAsyncResult result) {
-            return base.Channel.EndSendStreamedPlugins(result);
-        }
-        
-        private System.IAsyncResult OnBeginSendStreamedPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
+            return this.BeginGetStreamedJob(clientId, callback, asyncState);
+        }
+        
+        private object[] OnEndGetStreamedJob(System.IAsyncResult result) {
+            System.IO.Stream retVal = this.EndGetStreamedJob(result);
+            return new object[] {
+                    retVal};
+        }
+        
+        private void OnGetStreamedJobCompleted(object state) {
+            if ((this.GetStreamedJobCompleted != null)) {
+                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+                this.GetStreamedJobCompleted(this, new GetStreamedJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+            }
+        }
+        
+        public void GetStreamedJobAsync(System.Guid clientId) {
+            this.GetStreamedJobAsync(clientId, null);
+        }
+        
+        public void GetStreamedJobAsync(System.Guid clientId, object userState) {
+            if ((this.onBeginGetStreamedJobDelegate == null)) {
+                this.onBeginGetStreamedJobDelegate = new BeginOperationDelegate(this.OnBeginGetStreamedJob);
+            }
+            if ((this.onEndGetStreamedJobDelegate == null)) {
+                this.onEndGetStreamedJobDelegate = new EndOperationDelegate(this.OnEndGetStreamedJob);
+            }
+            if ((this.onGetStreamedJobCompletedDelegate == null)) {
+                this.onGetStreamedJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetStreamedJobCompleted);
+            }
+            base.InvokeAsync(this.onBeginGetStreamedJobDelegate, new object[] {
+                        clientId}, this.onEndGetStreamedJobDelegate, this.onGetStreamedJobCompletedDelegate, userState);
+        }
+        
+        public System.IO.Stream GetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
+            return base.Channel.GetStreamedPlugins(pluginList);
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public System.IAsyncResult BeginGetStreamedPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, System.AsyncCallback callback, object asyncState) {
+            return base.Channel.BeginGetStreamedPlugins(pluginList, callback, asyncState);
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public System.IO.Stream EndGetStreamedPlugins(System.IAsyncResult result) {
+            return base.Channel.EndGetStreamedPlugins(result);
+        }
+        
+        private System.IAsyncResult OnBeginGetStreamedPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
             HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList = ((HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[])(inValues[0]));
-            return this.BeginSendStreamedPlugins(pluginList, callback, asyncState);
-        }
-        
-        private object[] OnEndSendStreamedPlugins(System.IAsyncResult result) {
-            System.IO.Stream retVal = this.EndSendStreamedPlugins(result);
-            return new object[] {
-                    retVal};
-        }
-        
-        private void OnSendStreamedPluginsCompleted(object state) {
-            if ((this.SendStreamedPluginsCompleted != null)) {
-                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
-                this.SendStreamedPluginsCompleted(this, new SendStreamedPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
-            }
-        }
-        
-        public void SendStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
-            this.SendStreamedPluginsAsync(pluginList, null);
-        }
-        
-        public void SendStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
-            if ((this.onBeginSendStreamedPluginsDelegate == null)) {
-                this.onBeginSendStreamedPluginsDelegate = new BeginOperationDelegate(this.OnBeginSendStreamedPlugins);
-            }
-            if ((this.onEndSendStreamedPluginsDelegate == null)) {
-                this.onEndSendStreamedPluginsDelegate = new EndOperationDelegate(this.OnEndSendStreamedPlugins);
-            }
-            if ((this.onSendStreamedPluginsCompletedDelegate == null)) {
-                this.onSendStreamedPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendStreamedPluginsCompleted);
-            }
-            base.InvokeAsync(this.onBeginSendStreamedPluginsDelegate, new object[] {
-                        pluginList}, this.onEndSendStreamedPluginsDelegate, this.onSendStreamedPluginsCompletedDelegate, userState);
-        }
-        
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream) {
+            return this.BeginGetStreamedPlugins(pluginList, callback, asyncState);
+        }
+        
+        private object[] OnEndGetStreamedPlugins(System.IAsyncResult result) {
+            System.IO.Stream retVal = this.EndGetStreamedPlugins(result);
+            return new object[] {
+                    retVal};
+        }
+        
+        private void OnGetStreamedPluginsCompleted(object state) {
+            if ((this.GetStreamedPluginsCompleted != null)) {
+                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+                this.GetStreamedPluginsCompleted(this, new GetStreamedPluginsCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+            }
+        }
+        
+        public void GetStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList) {
+            this.GetStreamedPluginsAsync(pluginList, null);
+        }
+        
+        public void GetStreamedPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto[] pluginList, object userState) {
+            if ((this.onBeginGetStreamedPluginsDelegate == null)) {
+                this.onBeginGetStreamedPluginsDelegate = new BeginOperationDelegate(this.OnBeginGetStreamedPlugins);
+            }
+            if ((this.onEndGetStreamedPluginsDelegate == null)) {
+                this.onEndGetStreamedPluginsDelegate = new EndOperationDelegate(this.OnEndGetStreamedPlugins);
+            }
+            if ((this.onGetStreamedPluginsCompletedDelegate == null)) {
+                this.onGetStreamedPluginsCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetStreamedPluginsCompleted);
+            }
+            base.InvokeAsync(this.onBeginGetStreamedPluginsDelegate, new object[] {
+                        pluginList}, this.onEndGetStreamedPluginsDelegate, this.onGetStreamedPluginsCompletedDelegate, userState);
+        }
+        
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived StoreFinishedJobResultStreamed(System.IO.Stream stream) {
             return base.Channel.StoreFinishedJobResultStreamed(stream);
         }
@@ -1182 +1182 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndStoreFinishedJobResultStreamed(System.IAsyncResult result) {
             return base.Channel.EndStoreFinishedJobResultStreamed(result);
         }
@@ -1192 +1192 @@
         
         private object[] OnEndStoreFinishedJobResultStreamed(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndStoreFinishedJobResultStreamed(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndStoreFinishedJobResultStreamed(result);
             return new object[] {
                     retVal};
@@ -1222 +1222 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived ProcessSnapshotStreamed(System.IO.Stream stream) {
             return base.Channel.ProcessSnapshotStreamed(stream);
         }
@@ -1232 +1232 @@
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result) {
+        public HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived EndProcessSnapshotStreamed(System.IAsyncResult result) {
             return base.Channel.EndProcessSnapshotStreamed(result);
         }
@@ -1242 +1242 @@
         
         private object[] OnEndProcessSnapshotStreamed(System.IAsyncResult result) {
-            HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndProcessSnapshotStreamed(result);
+            HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived retVal = this.EndProcessSnapshotStreamed(result);
             return new object[] {
                     retVal};

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.svcmap

@@ -27 +27 @@
     <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" />
     <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" />
+    <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" />
     <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" />
     <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

@@ -19 +19 @@
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" />
       <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
@@ -68 +69 @@
     <wsdl:part name="parameters" element="tns:IsJobStillNeededResponse" />
   </wsdl:message>
-  <wsdl:message name="ISlaveFacade_SendPlugins_InputMessage">
-    <wsdl:part name="parameters" element="tns:SendPlugins" />
-  </wsdl:message>
-  <wsdl:message name="ISlaveFacade_SendPlugins_OutputMessage">
-    <wsdl:part name="parameters" element="tns:SendPluginsResponse" />
+  <wsdl:message name="ISlaveFacade_GetPlugins_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetPlugins" />
+  </wsdl:message>
+  <wsdl:message name="ISlaveFacade_GetPlugins_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetPluginsResponse" />
   </wsdl:message>
   <wsdl:message name="ISlaveFacade_GetCalendar_InputMessage">
@@ -86 +87 @@
     <wsdl:part name="parameters" element="tns:SetCalendarStatusResponse" />
   </wsdl:message>
-  <wsdl:message name="ISlaveFacade_SendStreamedJob_InputMessage">
-    <wsdl:part name="parameters" element="tns:SendStreamedJob" />
-  </wsdl:message>
-  <wsdl:message name="ISlaveFacade_SendStreamedJob_OutputMessage">
-    <wsdl:part name="parameters" element="tns:SendStreamedJobResponse" />
-  </wsdl:message>
-  <wsdl:message name="ISlaveFacade_SendStreamedPlugins_InputMessage">
-    <wsdl:part name="parameters" element="tns:SendStreamedPlugins" />
-  </wsdl:message>
-  <wsdl:message name="ISlaveFacade_SendStreamedPlugins_OutputMessage">
-    <wsdl:part name="parameters" element="tns:SendStreamedPluginsResponse" />
+  <wsdl:message name="ISlaveFacade_GetStreamedJob_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetStreamedJob" />
+  </wsdl:message>
+  <wsdl:message name="ISlaveFacade_GetStreamedJob_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetStreamedJobResponse" />
+  </wsdl:message>
+  <wsdl:message name="ISlaveFacade_GetStreamedPlugins_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetStreamedPlugins" />
+  </wsdl:message>
+  <wsdl:message name="ISlaveFacade_GetStreamedPlugins_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetStreamedPluginsResponse" />
   </wsdl:message>
   <wsdl:message name="ISlaveFacade_StoreFinishedJobResultStreamed_InputMessage">
@@ -139 +140 @@
       <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/IsJobStillNeededResponse" message="tns:ISlaveFacade_IsJobStillNeeded_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="SendPlugins">
-      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveCommunicator/SendPlugins" message="tns:ISlaveFacade_SendPlugins_InputMessage" />
-      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/SendPluginsResponse" message="tns:ISlaveFacade_SendPlugins_OutputMessage" />
+    <wsdl:operation name="GetPlugins">
+      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveCommunicator/GetPlugins" message="tns:ISlaveFacade_GetPlugins_InputMessage" />
+      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/GetPluginsResponse" message="tns:ISlaveFacade_GetPlugins_OutputMessage" />
     </wsdl:operation>
     <wsdl:operation name="GetCalendar">
@@ -151 +152 @@
       <wsdl:output wsaw:Action="http://tempuri.org/ISlaveCommunicator/SetCalendarStatusResponse" message="tns:ISlaveFacade_SetCalendarStatus_OutputMessage" />
     </wsdl:operation>
-    <wsdl:operation name="SendStreamedJob">
-      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedJob" message="tns:ISlaveFacade_SendStreamedJob_InputMessage" />
-      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedJobResponse" message="tns:ISlaveFacade_SendStreamedJob_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="SendStreamedPlugins">
-      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedPlugins" message="tns:ISlaveFacade_SendStreamedPlugins_InputMessage" />
-      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/SendStreamedPluginsResponse" message="tns:ISlaveFacade_SendStreamedPlugins_OutputMessage" />
+    <wsdl:operation name="GetStreamedJob">
+      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedJob" message="tns:ISlaveFacade_GetStreamedJob_InputMessage" />
+      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedJobResponse" message="tns:ISlaveFacade_GetStreamedJob_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="GetStreamedPlugins">
+      <wsdl:input wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedPlugins" message="tns:ISlaveFacade_GetStreamedPlugins_InputMessage" />
+      <wsdl:output wsaw:Action="http://tempuri.org/ISlaveFacade/GetStreamedPluginsResponse" message="tns:ISlaveFacade_GetStreamedPlugins_OutputMessage" />
     </wsdl:operation>
     <wsdl:operation name="StoreFinishedJobResultStreamed">
@@ -235 +236 @@
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="SendPlugins">
-      <soap12:operation soapAction="http://tempuri.org/ISlaveCommunicator/SendPlugins" style="document" />
+    <wsdl:operation name="GetPlugins">
+      <soap12:operation soapAction="http://tempuri.org/ISlaveCommunicator/GetPlugins" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
@@ -262 +263 @@
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="SendStreamedJob">
-      <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/SendStreamedJob" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SendStreamedPlugins">
-      <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/SendStreamedPlugins" style="document" />
+    <wsdl:operation name="GetStreamedJob">
+      <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/GetStreamedJob" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="GetStreamedPlugins">
+      <soap12:operation soapAction="http://tempuri.org/ISlaveFacade/GetStreamedPlugins" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/service2.xsd

@@ -2 +2 @@
 <xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" />
   <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
   <xs:import namespace="http://schemas.microsoft.com/Message" />
@@ -15 +15 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LoginResult" nillable="true" type="q2:Response" />
+        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="LoginResult" nillable="true" type="q2:Response" />
       </xs:sequence>
     </xs:complexType>
@@ -29 +29 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessHeartBeatResult" nillable="true" type="q4:ResponseHeartBeat" />
+        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="ProcessHeartBeatResult" nillable="true" type="q4:ResponseHeartBeat" />
       </xs:sequence>
     </xs:complexType>
@@ -43 +43 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="GetJobResult" nillable="true" type="q6:ResponseObjectOfJobDtoZAa7YIsz" />
+        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="GetJobResult" nillable="true" type="q6:ResponseObjectOfJobDtoZAa7YIsz" />
       </xs:sequence>
     </xs:complexType>
@@ -61 +61 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
+        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="StoreFinishedJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
       </xs:sequence>
     </xs:complexType>
@@ -79 +79 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotResult" nillable="true" type="q12:ResponseResultReceived" />
+        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="ProcessSnapshotResult" nillable="true" type="q12:ResponseResultReceived" />
       </xs:sequence>
     </xs:complexType>
@@ -93 +93 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LogoutResult" nillable="true" type="q14:Response" />
+        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="LogoutResult" nillable="true" type="q14:Response" />
       </xs:sequence>
     </xs:complexType>
@@ -107 +107 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="IsJobStillNeededResult" nillable="true" type="q16:Response" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SendPlugins">
+        <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="IsJobStillNeededResult" nillable="true" type="q16:Response" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetPlugins">
     <xs:complexType>
       <xs:sequence>
@@ -118 +118 @@
     </xs:complexType>
   </xs:element>
-  <xs:element name="SendPluginsResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendPluginsResult" nillable="true" type="q18:ResponseListOfCachedHivePluginInfoDtoZMwZop09" />
+  <xs:element name="GetPluginsResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="GetPluginsResult" nillable="true" type="q18:ResponseListOfCachedHivePluginInfoDtoZMwZop09" />
       </xs:sequence>
     </xs:complexType>
@@ -135 +135 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="GetCalendarResult" nillable="true" type="q20:ResponseCalendar" />
+        <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="GetCalendarResult" nillable="true" type="q20:ResponseCalendar" />
       </xs:sequence>
     </xs:complexType>
@@ -150 +150 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SetCalendarStatusResult" nillable="true" type="q23:Response" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SendStreamedJob">
+        <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="SetCalendarStatusResult" nillable="true" type="q23:Response" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetStreamedJob">
     <xs:complexType>
       <xs:sequence>
@@ -161 +161 @@
     </xs:complexType>
   </xs:element>
-  <xs:element name="SendStreamedJobResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q25="http://schemas.microsoft.com/Message" name="SendStreamedJobResult" type="q25:StreamBody" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SendStreamedPlugins">
+  <xs:element name="GetStreamedJobResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q25="http://schemas.microsoft.com/Message" name="GetStreamedJobResult" type="q25:StreamBody" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetStreamedPlugins">
     <xs:complexType>
       <xs:sequence>
@@ -175 +175 @@
     </xs:complexType>
   </xs:element>
-  <xs:element name="SendStreamedPluginsResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q27="http://schemas.microsoft.com/Message" name="SendStreamedPluginsResult" type="q27:StreamBody" />
+  <xs:element name="GetStreamedPluginsResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q27="http://schemas.microsoft.com/Message" name="GetStreamedPluginsResult" type="q27:StreamBody" />
       </xs:sequence>
     </xs:complexType>
@@ -192 +192 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q29="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="StoreFinishedJobResultStreamedResult" nillable="true" type="q29:ResponseResultReceived" />
+        <xs:element xmlns:q29="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="StoreFinishedJobResultStreamedResult" nillable="true" type="q29:ResponseResultReceived" />
       </xs:sequence>
     </xs:complexType>
@@ -206 +206 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q31="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessSnapshotStreamedResult" nillable="true" type="q31:ResponseResultReceived" />
+        <xs:element xmlns:q31="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.ResponseObjects" minOccurs="0" name="ProcessSnapshotStreamedResult" nillable="true" type="q31:ResponseResultReceived" />
       </xs:sequence>
     </xs:complexType>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

@@ -37 +37 @@
   using Service = HeuristicLab.Hive.Slave.Communication.ServerService;
   using HeuristicLab.Hive.Slave.Communication.ServerService;
+  using HeuristicLab.Hive.Contracts.ResponseObjects;
 
   /// <summary>
@@ -95 +96 @@
         Logger.Debug("Registring new Events");
         proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
-        proxy.SendStreamedJobCompleted += new EventHandler<SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
+        proxy.GetStreamedJobCompleted += new EventHandler<GetStreamedJobCompletedEventArgs>(proxy_GetStreamedJobCompleted);
         proxy.StoreFinishedJobResultStreamedCompleted += new EventHandler<StoreFinishedJobResultStreamedCompletedEventArgs>(proxy_StoreFinishedJobResultStreamedCompleted);
         proxy.ProcessSnapshotStreamedCompleted += new EventHandler<ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
@@ -159 +160 @@
     }
 
-
-
     /// <summary>
     /// Methods for the Server Login
@@ -184 +183 @@
         if (ConnState == NetworkEnum.WcfConnState.Connected) {
           Logger.Debug("STARTED: Login Sync");
-          HeuristicLab.Hive.Contracts.Response res = proxy.Login(clientInfo);
-          if (!res.Success) {
+          Response res = proxy.Login(clientInfo);
+          if (res.StatusMessage != ResponseStatus.Ok) {
             Logger.Error("FAILED: Login Failed! " + res.StatusMessage);
-            throw new Exception(res.StatusMessage);
+            throw new Exception(res.StatusMessage.ToString());
           } else {
             Logger.Info("ENDED: Login succeeded" + res.StatusMessage);
@@ -204 +203 @@
     /// </summary>
     #region PullJob
-    public event System.EventHandler<GetJobCompletedEventArgs> SendJobCompleted;
-    public void SendJobAsync(Guid guid) {
+    public event System.EventHandler<GetJobCompletedEventArgs> GetJobCompleted;
+    public void GetJobAsync(Guid guid) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
         Logger.Debug("STARTED: Fetching of Jobs from Server for Client");
-        proxy.SendStreamedJobAsync(guid);
-      }
-    }
-
-    void proxy_SendStreamedJobCompleted(object sender, SendStreamedJobCompletedEventArgs e) {
+        proxy.GetStreamedJobAsync(guid);
+      }
+    }
+
+    void proxy_GetStreamedJobCompleted(object sender, GetStreamedJobCompletedEventArgs e) {
       if (e.Error == null) {
         Logger.Debug("ENDED: Fetching of Jobs from Server for Client");
@@ -237 +236 @@
 
           GetJobCompletedEventArgs completedEventArgs = new GetJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
-          SendJobCompleted(sender, completedEventArgs);
+          GetJobCompleted(sender, completedEventArgs);
         } catch (Exception ex) {
           Logger.Error(ex);
@@ -257 +256 @@
     /// </summary>
     #region SendJobResults
-    public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
-    public void StoreFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
+    public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> GetFinishedJobResultCompleted;
+    public void GetFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
         Logger.Debug("STARTED: Sending back the finished job results");
@@ -279 +278 @@
         StoreFinishedJobResultCompletedEventArgs args = new StoreFinishedJobResultCompletedEventArgs(new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
         Logger.Debug("calling the Finished Job Event");
-        StoreFinishedJobResultCompleted(sender, args);
+        GetFinishedJobResultCompleted(sender, args);
         Logger.Debug("ENDED: Sending back the finished job results");
       } else {
@@ -328 +327 @@
 
     private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
-      if (e.Error == null && e.Result.Success) {
+      if (e.Error == null && e.Result.StatusMessage == ResponseStatus.Ok) {
         ProcessHeartBeatCompleted(sender, e);
         Logger.Debug("ENDED: sending heartbeats");
@@ -394 +393 @@
         Logger.Debug("STARTED: Requesting Plugins for Job");
         Logger.Debug("STARTED: Getting the stream");
-        Stream stream = proxy.SendStreamedPlugins(requestedPlugins.ToArray());
+        Stream stream = proxy.GetStreamedPlugins(requestedPlugins.ToArray());
         Logger.Debug("ENDED: Getting the stream");
         BinaryFormatter formatter = new BinaryFormatter();

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs

@@ -10 +10 @@
 using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

@@ -47 +47 @@
 using HeuristicLab.Core;
 using System.IO;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -88 +89 @@
       wcfService = WcfService.Instance;
       wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
-      wcfService.SendJobCompleted += new EventHandler<GetJobCompletedEventArgs>(wcfService_GetJobCompleted);
-      wcfService.StoreFinishedJobResultCompleted += new EventHandler<StoreFinishedJobResultCompletedEventArgs>(wcfService_StoreFinishedJobResultCompleted);
+      wcfService.GetJobCompleted += new EventHandler<GetJobCompletedEventArgs>(wcfService_GetJobCompleted);
+      wcfService.GetFinishedJobResultCompleted += new EventHandler<StoreFinishedJobResultCompletedEventArgs>(wcfService_StoreFinishedJobResultCompleted);
       wcfService.ProcessSnapshotCompleted += new EventHandler<ProcessSnapshotCompletedEventArgs>(wcfService_ProcessSnapshotCompleted);
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
@@ -153 +154 @@
         case MessageContainer.MessageType.FetchJob:
           if (!CurrentlyFetching) {
-            wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().Id);
+            wcfService.GetJobAsync(ConfigManager.Instance.GetClientInfo().Id);
             CurrentlyFetching = true;
           } else
@@ -232 +233 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
           Logger.Info("Sending the finished job with id: " + jId);
-          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
+          wcfService.GetFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
         } else {
           Logger.Info("Storing the finished job with id: " + jId + " to hdd");
@@ -286 +287 @@
     /// <param name="e"></param>
     void wcfService_LoginCompleted(object sender, LoginCompletedEventArgs e) {
-      if (e.Result.Success) {
+      if (e.Result.StatusMessage == ResponseStatus.Ok) {
         CurrentlyFetching = false;
         Logger.Info("Login completed to Hive Server @ " + DateTime.Now);
       } else
-        Logger.Error("Error during login: " + e.Result.StatusMessage);
+        Logger.Error("Error during login: " + e.Result.StatusMessage.ToString());
     }
 
@@ -299 +300 @@
     /// <param name="e"></param>
     void wcfService_GetJobCompleted(object sender, GetJobCompletedEventArgs e) {
-      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
+      if (e.Result.StatusMessage != ResponseStatus.GetJob_NoJobsAvailable) {
         Logger.Info("Received new job with id " + e.Result.Obj.Id);
         bool sandboxed = false;
@@ -355 +356 @@
       Logger.Info("Job submitted with id " + e.Result.JobId);
       KillAppDomain(e.Result.JobId);
-      if (e.Result.Success) {
+      if (e.Result.StatusMessage == ResponseStatus.Ok) {
         SlaveStatusInfo.JobsProcessed++;
         Logger.Info("Increased ProcessedJobs to:" + SlaveStatusInfo.JobsProcessed);
@@ -415 +416 @@
     private void FetchCalendarFromServer() {
       ResponseCalendar calres = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
-      if (calres.Success) {
+      if (calres.StatusMessage == ResponseStatus.Ok) {
         if (UptimeManager.Instance.SetAppointments(false, calres)) {
           Logger.Info("Remote calendar installed");

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs

@@ -12 +12 @@
 using System.Xml;
 using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Slave.Core.JobStorage {
@@ -49 +50 @@
           try {
             byte[] job = File.ReadAllBytes(path + filename + ".dat");
-            if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT) {
+            if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ResponseStatus.Ok) {
               ResponseResultReceived res = WcfService.Instance.StoreFinishedJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
-              if (!res.Success)
-                Logger.Error("sending of job failed: " + res.StatusMessage);
-              else
-                Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
+              Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
             }
             SlaveStatusInfo.JobsProcessed++;