Changeset 780

Timestamp:

11/19/08 16:08:49 (16 years ago)

Author:

msteinbi

Message:

New methods defined in IClientCommunicator (new response classes and HeartBeatData class) (#351)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/BusinessObjects/HeartBeatData.cs (added)
• HeuristicLab.Hive.Contracts/BusinessObjects/Job.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/Response.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/ResponseHB.cs (added)
• HeuristicLab.Hive.Contracts/ResponseJob.cs (added)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server/HiveServerApplication.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/Job.cs

@@ -31 +31 @@
   public class Job {
     [DataMember]
+    public long JobId { get; set; }
+    [DataMember]
     public State State { get; set; }
     [DataMember]

trunk/sources/HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj

@@ -56 +56 @@
     <Compile Include="BusinessObjects\GrantedPermissions.cs" />
     <Compile Include="BusinessObjects\ClientGroup.cs" />
+    <Compile Include="BusinessObjects\HeartBeatData.cs" />
     <Compile Include="BusinessObjects\Job.cs" />
     <Compile Include="BusinessObjects\JobResult.cs" />
@@ -66 +67 @@
     <Compile Include="BusinessObjects\User.cs" />
     <Compile Include="BusinessObjects\UserGroup.cs" />
+    <Compile Include="ResponseJob.cs" />
     <Compile Include="HiveContractPlugin.cs" />
     <Compile Include="Interfaces\IClientCommunicator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Response.cs" />
+    <Compile Include="ResponseHB.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs

@@ -27 +27 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 
-namespace HeuristicLab.Hive.Server.Interfaces {
+namespace HeuristicLab.Hive.Contracts.Interfaces {
   /// <summary>
   /// This is the facade for the client communication
@@ -35 +35 @@
     [OperationContract]
     Response Login(Client clientInfo);
+    [OperationContract]
+    ResponseHB SendHeartBeat(HeartBeatData hbData);
+    [OperationContract]
+    ResponseJob PullJob(Guid clientId);
+    [OperationContract]
+    Response SendJobResult(JobResult Result, bool finished);
+    [OperationContract]
+    Response Logout(Guid clientId);
   }
 }

trunk/sources/HeuristicLab.Hive.Contracts/Response.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using System.Runtime.Serialization;
 
-namespace HeuristicLab.Hive.Server {
+namespace HeuristicLab.Hive.Contracts {
   /// <summary>
   /// Server response class
   /// </summary>
+  [DataContract]
   public class Response {
+    [DataMember]
     public bool Success { get; set; }
-
+    [DataMember]
     public string StatusMessage { get; set; } 
   }

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
-using HeuristicLab.Hive.Server.Interfaces;
+using HeuristicLab.Hive.Contracts.Interfaces;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Server.Core {
-  class ClientCommunicator: IClientCommunicator {
+  /// <summary>
+  /// The ClientCommunicator manages the whole communication with the client
+  /// </summary>
+  public class ClientCommunicator: IClientCommunicator {
     #region IClientCommunicator Members
 
@@ -18 +22 @@
     }
 
+    public ResponseHB SendHeartBeat(HeartBeatData hbData) {
+      throw new NotImplementedException();
+    }
+
+    public ResponseJob PullJob(Guid clientId) {
+      throw new NotImplementedException();
+    }
+
+    public Response SendJobResult(JobResult Result, bool finished) {
+      throw new NotImplementedException();
+    }
+
+    public Response Logout(Guid clientId) {
+      throw new NotImplementedException();
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Hive.Server/HiveServerApplication.cs

@@ -29 +29 @@
 using System.Net;
 using HeuristicLab.Hive.Contracts;
-using HeuristicLab.Hive.Server.Interfaces;
+using HeuristicLab.Hive.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Server {