Changeset 4263 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts

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/HeuristicLab.Hive.Contracts/3.3

Files:

• ApplicationConstants.cs (modified) (1 diff)
• BusinessObjects/CachedHivePluginInfo.cs (deleted)
• BusinessObjects/Client.cs (deleted)
• BusinessObjects/ClientConfig.cs (deleted)
• BusinessObjects/ClientGroup.cs (deleted)
• BusinessObjects/GrantedPermissions.cs (deleted)
• BusinessObjects/HiveBaseObject.cs (deleted)
• BusinessObjects/HivePluginInfo.cs (deleted)
• BusinessObjects/IHiveObject.cs (deleted)
• BusinessObjects/Job.cs (deleted)
• BusinessObjects/Permission.cs (deleted)
• BusinessObjects/PermissionOwner.cs (deleted)
• BusinessObjects/Project.cs (deleted)
• BusinessObjects/Resource.cs (deleted)
• BusinessObjects/UpTimeStatistics.cs (deleted)
• BusinessObjects/User.cs (deleted)
• BusinessObjects/UserGroup.cs (deleted)
• HeuristicLab.Hive.Contracts-3.3.csproj (modified) (3 diffs)
• Interfaces/IExecutionEngineFacade.cs (modified) (2 diffs)
• Interfaces/IJobManager.cs (modified) (2 diffs)
• Interfaces/IServerConsoleFacade.cs (modified) (1 diff)
• Interfaces/ISlaveCommunicator.cs (modified) (2 diffs)
• Interfaces/ISlaveFacade.cs (modified) (2 diffs)
• Interfaces/ISlaveManager.cs (modified) (2 diffs)
• Interfaces/IUserRoleManager.cs (deleted)
• Response.cs (deleted)
• ResponseCalendar.cs (deleted)
• ResponseHeartBeat.cs (deleted)
• ResponseJob.cs (deleted)
• ResponseList.cs (deleted)
• ResponseObject.cs (deleted)
• ResponseObjects (added)
• ResponseObjects/Response.cs (added)
• ResponseObjects/ResponseCalendar.cs (added)
• ResponseObjects/ResponseHeartBeat.cs (added)
• ResponseObjects/ResponseList.cs (added)
• ResponseObjects/ResponseObject.cs (added)
• ResponseObjects/ResponseResultReceived.cs (added)
• ResponsePlugin.cs (deleted)
• ResponseResultReceived.cs (deleted)
• ResponseSerializedJob.cs (deleted)
• ResponseStatus.cs (added)

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]