Changeset 790 for trunk/sources

Timestamp:

11/20/08 15:41:25 (16 years ago)

Author:

whackl

Message:

implemented ticket (#376) (Client Services)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/ServerProxy.cs (modified) (8 diffs)
• HeuristicLab.Hive.Client.Communication/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (7 diffs)
• HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj (modified) (1 diff)
• HeuristicLab.sln (modified) (3 diffs)
• HeuristicLab/CopyAssemblies.cmd (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/ServerProxy.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
-using HeuristicLab.Hive.Server.Interfaces;
 
 namespace HeuristicLab.Hive.Client.Communication {
@@ -11 +10 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/Login", ReplyAction = "http://tempuri.org/IClientCommunicator/LoginResponse")]
-    HeuristicLab.Hive.Server.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.Client clientInfo);
+    HeuristicLab.Hive.Contracts.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.Client clientInfo);
 
     [System.ServiceModel.OperationContractAttribute(AsyncPattern = true, Action = "http://tempuri.org/IClientCommunicator/Login", ReplyAction = "http://tempuri.org/IClientCommunicator/LoginResponse")]
     System.IAsyncResult BeginLogin(HeuristicLab.Hive.Contracts.BusinessObjects.Client clientInfo, System.AsyncCallback callback, object asyncState);
 
-    HeuristicLab.Hive.Server.Response EndLogin(System.IAsyncResult result);
+    HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/SendHeartBeat", ReplyAction = "http://tempuri.org/IClientCommunicator/SendHeartBeatResponse")]
+    HeuristicLab.Hive.Contracts.ResponseHB SendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
+
+    [System.ServiceModel.OperationContractAttribute(AsyncPattern = true, Action = "http://tempuri.org/IClientCommunicator/SendHeartBeat", ReplyAction = "http://tempuri.org/IClientCommunicator/SendHeartBeatResponse")]
+    System.IAsyncResult BeginSendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
+
+    HeuristicLab.Hive.Contracts.ResponseHB EndSendHeartBeat(System.IAsyncResult result);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/PullJob", ReplyAction = "http://tempuri.org/IClientCommunicator/PullJobResponse")]
+    HeuristicLab.Hive.Contracts.ResponseJob PullJob(System.Guid clientId);
+
+    [System.ServiceModel.OperationContractAttribute(AsyncPattern = true, Action = "http://tempuri.org/IClientCommunicator/PullJob", ReplyAction = "http://tempuri.org/IClientCommunicator/PullJobResponse")]
+    System.IAsyncResult BeginPullJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
+
+    HeuristicLab.Hive.Contracts.ResponseJob EndPullJob(System.IAsyncResult result);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction = "http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
+    HeuristicLab.Hive.Contracts.Response SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished);
+
+    [System.ServiceModel.OperationContractAttribute(AsyncPattern = true, Action = "http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction = "http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
+    System.IAsyncResult BeginSendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished, System.AsyncCallback callback, object asyncState);
+
+    HeuristicLab.Hive.Contracts.Response EndSendJobResult(System.IAsyncResult result);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/Logout", ReplyAction = "http://tempuri.org/IClientCommunicator/LogoutResponse")]
+    HeuristicLab.Hive.Contracts.Response Logout(System.Guid clientId);
+
+    [System.ServiceModel.OperationContractAttribute(AsyncPattern = true, Action = "http://tempuri.org/IClientCommunicator/Logout", ReplyAction = "http://tempuri.org/IClientCommunicator/LogoutResponse")]
+    System.IAsyncResult BeginLogout(System.Guid clientId, System.AsyncCallback callback, object asyncState);
+
+    HeuristicLab.Hive.Contracts.Response EndLogout(System.IAsyncResult result);
   }
 
@@ -34 +65 @@
     }
 
-    public HeuristicLab.Hive.Server.Response Result {
+    public HeuristicLab.Hive.Contracts.Response Result {
       get {
         base.RaiseExceptionIfNecessary();
-        return ((HeuristicLab.Hive.Server.Response)(this.results[0]));
+        return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
+  public partial class SendHeartBeatCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+    private object[] results;
+
+    public SendHeartBeatCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+      base(exception, cancelled, userState) {
+      this.results = results;
+    }
+
+    public HeuristicLab.Hive.Contracts.ResponseHB Result {
+      get {
+        base.RaiseExceptionIfNecessary();
+        return ((HeuristicLab.Hive.Contracts.ResponseHB)(this.results[0]));
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
+  public partial class PullJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+    private object[] results;
+
+    public PullJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+      base(exception, cancelled, userState) {
+      this.results = results;
+    }
+
+    public HeuristicLab.Hive.Contracts.ResponseJob Result {
+      get {
+        base.RaiseExceptionIfNecessary();
+        return ((HeuristicLab.Hive.Contracts.ResponseJob)(this.results[0]));
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
+  public partial class SendJobResultCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+    private object[] results;
+
+    public SendJobResultCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+      base(exception, cancelled, userState) {
+      this.results = results;
+    }
+
+    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", "3.0.0.0")]
+  public partial class LogoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+    private object[] results;
+
+    public LogoutCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+      base(exception, cancelled, userState) {
+      this.results = results;
+    }
+
+    public HeuristicLab.Hive.Contracts.Response Result {
+      get {
+        base.RaiseExceptionIfNecessary();
+        return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
       }
     }
@@ -51 +158 @@
 
     private System.Threading.SendOrPostCallback onLoginCompletedDelegate;
+
+    private BeginOperationDelegate onBeginSendHeartBeatDelegate;
+
+    private EndOperationDelegate onEndSendHeartBeatDelegate;
+
+    private System.Threading.SendOrPostCallback onSendHeartBeatCompletedDelegate;
+
+    private BeginOperationDelegate onBeginPullJobDelegate;
+
+    private EndOperationDelegate onEndPullJobDelegate;
+
+    private System.Threading.SendOrPostCallback onPullJobCompletedDelegate;
+
+    private BeginOperationDelegate onBeginSendJobResultDelegate;
+
+    private EndOperationDelegate onEndSendJobResultDelegate;
+
+    private System.Threading.SendOrPostCallback onSendJobResultCompletedDelegate;
+
+    private BeginOperationDelegate onBeginLogoutDelegate;
+
+    private EndOperationDelegate onEndLogoutDelegate;
+
+    private System.Threading.SendOrPostCallback onLogoutCompletedDelegate;
 
     public ClientCommunicatorClient() {
@@ -73 +204 @@
     public event System.EventHandler<LoginCompletedEventArgs> LoginCompleted;
 
-    public HeuristicLab.Hive.Server.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.Client clientInfo) {
+    public event System.EventHandler<SendHeartBeatCompletedEventArgs> SendHeartBeatCompleted;
+
+    public event System.EventHandler<PullJobCompletedEventArgs> PullJobCompleted;
+
+    public event System.EventHandler<SendJobResultCompletedEventArgs> SendJobResultCompleted;
+
+    public event System.EventHandler<LogoutCompletedEventArgs> LogoutCompleted;
+
+    public HeuristicLab.Hive.Contracts.Response Login(HeuristicLab.Hive.Contracts.BusinessObjects.Client clientInfo) {
       return base.Channel.Login(clientInfo);
     }
@@ -83 +222 @@
 
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    public HeuristicLab.Hive.Server.Response EndLogin(System.IAsyncResult result) {
+    public HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result) {
       return base.Channel.EndLogin(result);
     }
@@ -93 +232 @@
 
     private object[] OnEndLogin(System.IAsyncResult result) {
-      HeuristicLab.Hive.Server.Response retVal = this.EndLogin(result);
+      HeuristicLab.Hive.Contracts.Response retVal = this.EndLogin(result);
       return new object[] {
                 retVal};
@@ -122 +261 @@
                     clientInfo}, this.onEndLoginDelegate, this.onLoginCompletedDelegate, userState);
     }
+
+    public HeuristicLab.Hive.Contracts.ResponseHB SendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+      return base.Channel.SendHeartBeat(hbData);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public System.IAsyncResult BeginSendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState) {
+      return base.Channel.BeginSendHeartBeat(hbData, callback, asyncState);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public HeuristicLab.Hive.Contracts.ResponseHB EndSendHeartBeat(System.IAsyncResult result) {
+      return base.Channel.EndSendHeartBeat(result);
+    }
+
+    private System.IAsyncResult OnBeginSendHeartBeat(object[] inValues, System.AsyncCallback callback, object asyncState) {
+      HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData = ((HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData)(inValues[0]));
+      return this.BeginSendHeartBeat(hbData, callback, asyncState);
+    }
+
+    private object[] OnEndSendHeartBeat(System.IAsyncResult result) {
+      HeuristicLab.Hive.Contracts.ResponseHB retVal = this.EndSendHeartBeat(result);
+      return new object[] {
+                retVal};
+    }
+
+    private void OnSendHeartBeatCompleted(object state) {
+      if ((this.SendHeartBeatCompleted != null)) {
+        InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+        this.SendHeartBeatCompleted(this, new SendHeartBeatCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+      }
+    }
+
+    public void SendHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+      this.SendHeartBeatAsync(hbData, null);
+    }
+
+    public void SendHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, object userState) {
+      if ((this.onBeginSendHeartBeatDelegate == null)) {
+        this.onBeginSendHeartBeatDelegate = new BeginOperationDelegate(this.OnBeginSendHeartBeat);
+      }
+      if ((this.onEndSendHeartBeatDelegate == null)) {
+        this.onEndSendHeartBeatDelegate = new EndOperationDelegate(this.OnEndSendHeartBeat);
+      }
+      if ((this.onSendHeartBeatCompletedDelegate == null)) {
+        this.onSendHeartBeatCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendHeartBeatCompleted);
+      }
+      base.InvokeAsync(this.onBeginSendHeartBeatDelegate, new object[] {
+                    hbData}, this.onEndSendHeartBeatDelegate, this.onSendHeartBeatCompletedDelegate, userState);
+    }
+
+    public HeuristicLab.Hive.Contracts.ResponseJob PullJob(System.Guid clientId) {
+      return base.Channel.PullJob(clientId);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public System.IAsyncResult BeginPullJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
+      return base.Channel.BeginPullJob(clientId, callback, asyncState);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public HeuristicLab.Hive.Contracts.ResponseJob EndPullJob(System.IAsyncResult result) {
+      return base.Channel.EndPullJob(result);
+    }
+
+    private System.IAsyncResult OnBeginPullJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
+      System.Guid clientId = ((System.Guid)(inValues[0]));
+      return this.BeginPullJob(clientId, callback, asyncState);
+    }
+
+    private object[] OnEndPullJob(System.IAsyncResult result) {
+      HeuristicLab.Hive.Contracts.ResponseJob retVal = this.EndPullJob(result);
+      return new object[] {
+                retVal};
+    }
+
+    private void OnPullJobCompleted(object state) {
+      if ((this.PullJobCompleted != null)) {
+        InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+        this.PullJobCompleted(this, new PullJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+      }
+    }
+
+    public void PullJobAsync(System.Guid clientId) {
+      this.PullJobAsync(clientId, null);
+    }
+
+    public void PullJobAsync(System.Guid clientId, object userState) {
+      if ((this.onBeginPullJobDelegate == null)) {
+        this.onBeginPullJobDelegate = new BeginOperationDelegate(this.OnBeginPullJob);
+      }
+      if ((this.onEndPullJobDelegate == null)) {
+        this.onEndPullJobDelegate = new EndOperationDelegate(this.OnEndPullJob);
+      }
+      if ((this.onPullJobCompletedDelegate == null)) {
+        this.onPullJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnPullJobCompleted);
+      }
+      base.InvokeAsync(this.onBeginPullJobDelegate, new object[] {
+                    clientId}, this.onEndPullJobDelegate, this.onPullJobCompletedDelegate, userState);
+    }
+
+    public HeuristicLab.Hive.Contracts.Response SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished) {
+      return base.Channel.SendJobResult(Result, finished);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public System.IAsyncResult BeginSendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished, System.AsyncCallback callback, object asyncState) {
+      return base.Channel.BeginSendJobResult(Result, finished, callback, asyncState);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public HeuristicLab.Hive.Contracts.Response EndSendJobResult(System.IAsyncResult result) {
+      return base.Channel.EndSendJobResult(result);
+    }
+
+    private System.IAsyncResult OnBeginSendJobResult(object[] inValues, System.AsyncCallback callback, object asyncState) {
+      HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result = ((HeuristicLab.Hive.Contracts.BusinessObjects.JobResult)(inValues[0]));
+      bool finished = ((bool)(inValues[1]));
+      return this.BeginSendJobResult(Result, finished, callback, asyncState);
+    }
+
+    private object[] OnEndSendJobResult(System.IAsyncResult result) {
+      HeuristicLab.Hive.Contracts.Response retVal = this.EndSendJobResult(result);
+      return new object[] {
+                retVal};
+    }
+
+    private void OnSendJobResultCompleted(object state) {
+      if ((this.SendJobResultCompleted != null)) {
+        InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+        this.SendJobResultCompleted(this, new SendJobResultCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+      }
+    }
+
+    public void SendJobResultAsync(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished) {
+      this.SendJobResultAsync(Result, finished, null);
+    }
+
+    public void SendJobResultAsync(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished, object userState) {
+      if ((this.onBeginSendJobResultDelegate == null)) {
+        this.onBeginSendJobResultDelegate = new BeginOperationDelegate(this.OnBeginSendJobResult);
+      }
+      if ((this.onEndSendJobResultDelegate == null)) {
+        this.onEndSendJobResultDelegate = new EndOperationDelegate(this.OnEndSendJobResult);
+      }
+      if ((this.onSendJobResultCompletedDelegate == null)) {
+        this.onSendJobResultCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendJobResultCompleted);
+      }
+      base.InvokeAsync(this.onBeginSendJobResultDelegate, new object[] {
+                    Result,
+                    finished}, this.onEndSendJobResultDelegate, this.onSendJobResultCompletedDelegate, userState);
+    }
+
+    public HeuristicLab.Hive.Contracts.Response Logout(System.Guid clientId) {
+      return base.Channel.Logout(clientId);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public System.IAsyncResult BeginLogout(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
+      return base.Channel.BeginLogout(clientId, callback, asyncState);
+    }
+
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    public HeuristicLab.Hive.Contracts.Response EndLogout(System.IAsyncResult result) {
+      return base.Channel.EndLogout(result);
+    }
+
+    private System.IAsyncResult OnBeginLogout(object[] inValues, System.AsyncCallback callback, object asyncState) {
+      System.Guid clientId = ((System.Guid)(inValues[0]));
+      return this.BeginLogout(clientId, callback, asyncState);
+    }
+
+    private object[] OnEndLogout(System.IAsyncResult result) {
+      HeuristicLab.Hive.Contracts.Response retVal = this.EndLogout(result);
+      return new object[] {
+                retVal};
+    }
+
+    private void OnLogoutCompleted(object state) {
+      if ((this.LogoutCompleted != null)) {
+        InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
+        this.LogoutCompleted(this, new LogoutCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+      }
+    }
+
+    public void LogoutAsync(System.Guid clientId) {
+      this.LogoutAsync(clientId, null);
+    }
+
+    public void LogoutAsync(System.Guid clientId, object userState) {
+      if ((this.onBeginLogoutDelegate == null)) {
+        this.onBeginLogoutDelegate = new BeginOperationDelegate(this.OnBeginLogout);
+      }
+      if ((this.onEndLogoutDelegate == null)) {
+        this.onEndLogoutDelegate = new EndOperationDelegate(this.OnEndLogout);
+      }
+      if ((this.onLogoutCompletedDelegate == null)) {
+        this.onLogoutCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnLogoutCompleted);
+      }
+      base.InvokeAsync(this.onBeginLogoutDelegate, new object[] {
+                    clientId}, this.onEndLogoutDelegate, this.onLogoutCompletedDelegate, userState);
+    }
   }
 }
+

trunk/sources/HeuristicLab.Hive.Client.Communication/ServiceLocator.cs

@@ -13 +13 @@
         proxy = new ClientCommunicatorClient(
           new NetTcpBinding(),
-          new EndpointAddress("net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator")
+          new EndpointAddress("net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator")
           );
       }

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -32 +32 @@
 using System.Security.Policy;
 using System.Security;
+using HeuristicLab.Hive.Client.Communication;
+using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
 
 
@@ -58 +60 @@
     }
 
-    public void Start() {      
-      Heartbeat beat = new Heartbeat();
-      beat.Interval = 5000;
-      beat.StartHeartbeat();  
+    public void Start() {
+      Heartbeat beat = new Heartbeat { Interval = 5000 };
+      beat.StartHeartbeat();
+
+      BO.Client clientInfo = new BO.Client { ClientId = Guid.NewGuid() };
+
+      ClientCommunicatorClient clientCommunicator = ServiceLocator.GetClientCommunicator();
+      clientCommunicator.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(ClientCommunicator_LoginCompleted);
+      clientCommunicator.LoginAsync(clientInfo);
 
       MessageQueue queue = MessageQueue.GetInstance();
-      queue.AddMessage(MessageContainer.MessageType.FetchJob);     
+      queue.AddMessage(MessageContainer.MessageType.FetchJob);
       while (true) {
         MessageContainer container = queue.GetMessage();
         Debug.WriteLine("Main loop received this message: " + container.Message.ToString());
-        Logging.GetInstance().Info(this.ToString(), container.Message.ToString()); 
+        Logging.GetInstance().Info(this.ToString(), container.Message.ToString());
         DetermineAction(container);
       }
+    }
+
+    void ClientCommunicator_LoginCompleted(object sender, LoginCompletedEventArgs e) {     
+      if (e.Result.Success) {
+        Logging.GetInstance().Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);
+        Status.LoginTime = DateTime.Now;
+        Status.LoggedIn = true;
+      } else
+        Logging.GetInstance().Error(this.ToString(), e.Result.StatusMessage);
     }
 
@@ -77 +93 @@
       if (sandboxed) {
         pset = new PermissionSet(PermissionState.None);
-        pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));        
+        pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
       } else {
         pset = new PermissionSet(PermissionState.Unrestricted);
@@ -85 +101 @@
       //Temp Fix!
       setup.PrivateBinPath = "plugins";
-      return System.AppDomain.CreateDomain("appD", AppDomain.CurrentDomain.Evidence, setup, pset, CreateStrongName(Assembly.GetExecutingAssembly())); 
+      return System.AppDomain.CreateDomain("appD", AppDomain.CurrentDomain.Evidence, setup, pset, CreateStrongName(Assembly.GetExecutingAssembly()));
 
     }
@@ -97 +113 @@
           Debug.WriteLine("-- Job Aborted Message received");
           break;
-        
-        
+
+
         case MessageContainer.MessageType.RequestSnapshot:
           engines[container.JobId].RequestSnapshot();
@@ -105 +121 @@
           engines[container.JobId].GetSnapshot();
           break;
-        
-        
+
+
         case MessageContainer.MessageType.FetchJob:
           bool sandboxed = true;
 
           IJob job = CreateNewJob();
-          
-          AppDomain appDomain = CreateNewAppDomain(true);
+
+          AppDomain appDomain = CreateNewAppDomain(false);
           appDomains.Add(job.JobId, appDomain);
-          
+
           Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
           engine.Job = job;
@@ -132 +148 @@
       }
     }
-    
+
     /// <summary>
     /// Simulator Class for new Jobs. will be replaced with fetching Jobs from the Interface

trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

@@ -26 +26 @@
 using System.Timers;
 using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Client.Communication;
+using System.Diagnostics;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
+//using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -61 +65 @@
     void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
       Console.WriteLine("tick");
+      ClientCommunicatorClient clientCommunicator = ServiceLocator.GetClientCommunicator();
+      HeartBeatData heartBeatData = new HeartBeatData { ClientId = Guid.NewGuid(), 
+                                                              freeCores = 4, 
+                                                              freeMemory = 1000, 
+                                                              jobProgress = 1};
+
+      clientCommunicator.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(ClientCommunicator_SendHeartBeatCompleted);
+      clientCommunicator.SendHeartBeatAsync(heartBeatData);
+
       //MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.FetchJob);
+
+    }
+
+    void ClientCommunicator_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
+      System.Diagnostics.Debug.WriteLine("Heartbeat received");
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj

@@ -86 +86 @@
       <Name>HeuristicLab.Hive.Client.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Hive.Client.Communication\HeuristicLab.Hive.Client.Communication.csproj">
+      <Project>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</Project>
+      <Name>HeuristicLab.Hive.Client.Communication</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Hive.Client.ExecutionEngine\HeuristicLab.Hive.Client.ExecutionEngine.csproj">
       <Project>{1605256A-1CB3-44AB-AAFF-577093EE5789}</Project>
       <Name>HeuristicLab.Hive.Client.ExecutionEngine</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Hive.Contracts\HeuristicLab.Hive.Contracts.csproj">
+      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
+      <Name>HeuristicLab.Hive.Contracts</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.sln

@@ -127 +127 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.ExecutionEngine", "HeuristicLab.Hive.Client.ExecutionEngine\HeuristicLab.Hive.Client.ExecutionEngine.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Communication", "HeuristicLab.Hive.Client.Communication\HeuristicLab.Hive.Client.Communication.csproj", "{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Console", "HeuristicLab.Hive.Server.Console\HeuristicLab.Hive.Server.Console.csproj", "{42A1D075-6C12-4DD9-B0C2-C6F5210A8119}"
@@ -583 +585 @@
     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|Any CPU
+<<<<<<< .mine
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.Build.0 = Release|Any CPU
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|Any CPU
+=======
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -589 +599 @@
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|Any CPU.Build.0 = Release|Any CPU
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|x86.ActiveCfg = Release|Any CPU
+>>>>>>> .r781
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab/CopyAssemblies.cmd

@@ -70 +70 @@
 copy %1\HeuristicLab.Hive.Client.Console\%2\HeuristicLab.Hive.Client.Console-3.2.dll .\plugins
 copy %1\HeuristicLab.Hive.Client.ExecutionEngine\%2\HeuristicLab.Hive.Client.ExecutionEngine-3.2.dll .\plugins
+copy %1\HeuristicLab.Hive.Client.Communication\%2\HeuristicLab.Hive.Client.Communication-3.2.dll .\plugins
+copy %1\HeuristicLab.Hive.Client.ExecutionEngine\%2\HeuristicLab.Hive.Client.ExecutionEngine-3.2.dll .\plugins
 copy %1\HeuristicLab.Hive.Server.Console\%2\HeuristicLab.Hive.Server.Console-3.2.dll .\plugins