Changeset 5156 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

12/21/10 18:46:12 (14 years ago)

Author:

ascheibe

Message:

#1233

• Implemented communication interface between Slave and a Slave Client using Named Pipes and callbacks
• Added new project for testing Slave - Client communication
• Added some copyright info headers

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4 (added)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj (added)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Program.cs (added)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Properties (added)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/SlaveCommListener.cs (added)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/app.config (added)
• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockJob.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Tests/PluginLoader.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (21 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/DummyListener.cs (added)
• HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts (added)
• HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.cs (added)
• HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunicationCallbacks.cs (added)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveClientCom.cs (added)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs (added)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/app.config (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/PersistenceUtil.cs (modified) (1 diff)
• HeuristicLab.Hive 3.4.sln (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/Mocks/MockAuthorizationManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Tests/PluginLoader.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/ServiceTests.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.IO;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockJob.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
+using System.Threading;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Hive;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
-using HeuristicLab.Common;
-using System.Drawing;
-using System.Threading;
-using System.Diagnostics;
 
 namespace HeuristicLab.Clients.Hive.Slave.Tests {
@@ -172 +190 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-                                                      
+
     public event EventHandler JobFailed;
     protected virtual void OnJobFailed(Exception e) {
       EventHandler handler = JobFailed;
-      EventArgs<Exception> ev = new EventArgs<Exception>(e);          
+      EventArgs<Exception> ev = new EventArgs<Exception>(e);
       if (handler != null) handler(this, ev);
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockServiceLocator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using HeuristicLab.Clients.Common;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 
 namespace HeuristicLab.Clients.Hive.Slave.Tests {
-  internal class MockServiceLocator : IServiceLocator {
+  public class MockServiceLocator : IServiceLocator {
 
     private MockHiveService service;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/PluginLoader.cs

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System;
 using System.Collections.Generic;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -26 +26 @@
 using System.Threading;
 using HeuristicLab.Clients.Hive.Slave;
+using HeuristicLab.Clients.Hive.Slave.ServiceContracts;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -45 +46 @@
 
     private WcfService wcfService;
-    public HeartbeatManager heartbeatManager;
-
+    private HeartbeatManager heartbeatManager;
     private int coreThreadId;
+
+    private ISlaveCommunication ClientCom;
 
     public Dictionary<Guid, Executor> ExecutionEngines {
@@ -66 +68 @@
     public void Start() {
       abortRequested = false;
-      Logger.Info("Hive Slave started");
-      //TODO: implement slave console server
-      //SlaveConsoleServer server = new SlaveConsoleServer();
-      //server.Start();
+
+      ClientCom = SlaveClientCom.Instance.ClientCom;
+      ClientCom.LogMessage("Hive Slave started");
 
       ConfigManager manager = ConfigManager.Instance;
@@ -82 +83 @@
       DeRegisterServiceEvents();
 
-      //server.Close();
-      Logger.Info("Program shutdown");
+      ClientCom.LogMessage("Program shutdown");
     }
 
@@ -101 +101 @@
 
     private void RegisterServiceEvents() {
-      //TODO
+      WcfService.Instance.Connected += new EventHandler(wcfService_Connected);
+      WcfService.Instance.ExceptionOccured += new EventHandler<EventArgs<Exception>>(wcfService_ExceptionOccured);
     }
 
     private void DeRegisterServiceEvents() {
-      //TODO
+      WcfService.Instance.Connected -= wcfService_Connected;
+      WcfService.Instance.ExceptionOccured -= wcfService_ExceptionOccured;
+    }
+
+    void wcfService_ExceptionOccured(object sender, EventArgs<Exception> e) {
+      ClientCom.LogMessage("Connection to server interruped with exception: " + e.Value.Message);
+      ShutdownCore();
+    }
+
+    void wcfService_Connected(object sender, EventArgs e) {
+      ClientCom.LogMessage("Connected successfully to Hive server");
     }
 
@@ -113 +124 @@
     /// <param name="container">The Container, containing the message</param>
     private void DetermineAction(MessageContainer container) {
-      Logger.Info("Message: " + container.Message.ToString() + " for job: " + container.JobId);
+      ClientCom.LogMessage("Message: " + container.Message.ToString() + " for job: " + container.JobId);
       //TODO: find a better solution
       if (container is ExecutorMessageContainer<Guid>) {
@@ -129 +140 @@
                 // appdomain already unloaded. Finishing job probably ongoing
               } else
-              Logger.Error("AbortJob: Engine doesn't exist");
+              ClientCom.LogMessage("AbortJob: Engine doesn't exist");
             break;
 
@@ -146 +157 @@
         }
       } else {
-        Logger.Warn("Unknown MessageContainer: " + container);
+        ClientCom.LogMessage("Unknown MessageContainer: " + container);
       }
     }
 
     public void ShutdownCore() {
-      Logger.Info("Shutdown Signal received");
-      Logger.Debug("Stopping heartbeat");
+      ClientCom.LogMessage("Shutdown Signal received");
+      ClientCom.LogMessage("Stopping heartbeat");
       heartbeatManager.StopHeartBeat();
       abortRequested = true;
-      Logger.Debug("Logging out");
+      ClientCom.LogMessage("Logging out");
 
       lock (engines) {
-        Logger.Debug("engines locked");
+        ClientCom.LogMessage("engines locked");
         foreach (KeyValuePair<Guid, AppDomain> kvp in appDomains) {
-          Logger.Debug("Shutting down Appdomain for " + kvp.Key);
+          ClientCom.LogMessage("Shutting down Appdomain for " + kvp.Key);
           appDomains[kvp.Key].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           AppDomain.Unload(kvp.Value);
@@ -166 +177 @@
       }
       WcfService.Instance.Disconnect();
+      ClientCom.Shutdown();
+      SlaveClientCom.Close();
     }
 
@@ -176 +189 @@
     public void PauseJob(JobData data) {
       if (!Jobs.ContainsKey(data.JobId)) {
-        Logger.Error("Can't find job with id " + data.JobId);
+        ClientCom.LogMessage("Can't find job with id " + data.JobId);
       } else {
         Job job = Jobs[data.JobId];
@@ -194 +207 @@
       try {
         Guid jId = (Guid)jobId;
-        Logger.Info("Getting the finished job with id: " + jId);
+        ClientCom.LogMessage("Getting the finished job with id: " + jId);
         if (!engines.ContainsKey(jId)) {
-          Logger.Info("Engine doesn't exist");
+          ClientCom.LogMessage("Engine doesn't exist");
           return;
         }
         if (!jobs.ContainsKey(jId)) {
-          Logger.Info("Job doesn't exist");
+          ClientCom.LogMessage("Job doesn't exist");
           return;
         }
@@ -210 +223 @@
 
         try {
-          Logger.Info("Sending the finished job with id: " + jId);
+          ClientCom.LogMessage("Sending the finished job with id: " + jId);
           wcfService.UpdateJob(cJob, sJob);
           SlaveStatusInfo.JobsProcessed++;
         }
         catch (Exception e) {
-          Logger.Info("Transmitting to server failed. Storing the finished job with id: " + jId + " to hdd (" + e.ToString() + ")");
+          ClientCom.LogMessage("Transmitting to server failed. Storing the finished job with id: " + jId + " to hdd (" + e.ToString() + ")");
         }
         finally {
@@ -233 +246 @@
     /// <param name="e"></param>
     private void StartJobInAppDomain(Job myJob, JobData jobData) {
-      Logger.Info("Received new job with id " + myJob.Id);
+      ClientCom.LogMessage("Received new job with id " + myJob.Id);
       String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString());
       bool pluginsPrepared = false;
@@ -239 +252 @@
       try {
         PluginCache.Instance.PreparePlugins(myJob, jobData);
-        Logger.Debug("Plugins fetched for job " + myJob.Id);
+        ClientCom.LogMessage("Plugins fetched for job " + myJob.Id);
         pluginsPrepared = true;
       }
       catch (Exception exception) {
-        Logger.Error(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
+        ClientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
       }
 
@@ -254 +267 @@
               jobs.Add(myJob.Id, myJob);
               appDomains.Add(myJob.Id, appDomain);
-              Logger.Debug("Creating AppDomain");
+              ClientCom.LogMessage("Creating AppDomain");
               Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-              Logger.Debug("Created AppDomain");
+              ClientCom.LogMessage("Created AppDomain");
               engine.JobId = myJob.Id;
               engine.core = this;
-              Logger.Debug("Starting Engine for job " + myJob.Id);
+              ClientCom.LogMessage("Starting Engine for job " + myJob.Id);
               engines.Add(myJob.Id, engine);
               engine.Start(jobData.Data);
               SlaveStatusInfo.JobsFetched++;
-              Logger.Info("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
+              ClientCom.LogMessage("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
             }
           }
@@ -269 +282 @@
         }
         catch (Exception exception) {
-          Logger.Error("Creating the Appdomain and loading the job failed for job " + myJob.Id);
-          Logger.Error("Error thrown is: ", exception);
+          ClientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id);
+          ClientCom.LogMessage("Error thrown is: " + exception.ToString());
           KillAppDomain(myJob.Id);
         }
@@ -278 +291 @@
     public event EventHandler<EventArgs<Exception>> ExceptionOccured;
     private void OnExceptionOccured(Exception e) {
-      Logger.Error("Error: " + e.ToString());
+      ClientCom.LogMessage("Error: " + e.ToString());
       var handler = ExceptionOccured;
       if (handler != null) handler(this, new EventArgs<Exception>(e));
@@ -284 +297 @@
 
     private void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
-      Logger.Error("Exception in AppDomain: " + e.ExceptionObject.ToString());
+      ClientCom.LogMessage("Exception in AppDomain: " + e.ExceptionObject.ToString());
       KillAppDomain(new Guid(e.ExceptionObject.ToString()));
     }
@@ -316 +329 @@
     public void KillAppDomain(Guid id) {
       if (EnqueueExecutorMessage<Guid>(KillAppDomain, id)) {
-        Logger.Debug("Shutting down Appdomain for Job " + id);
+        ClientCom.LogMessage("Shutting down Appdomain for Job " + id);
         lock (engines) {
           try {
@@ -334 +347 @@
                 }
                 catch (CannotUnloadAppDomainException) {
-                  Logger.Error("Could not unload AppDomain, will try again in 1 sec.");
+                  ClientCom.LogMessage("Could not unload AppDomain, will try again in 1 sec.");
                   Thread.Sleep(1000);
                   repeat--;
@@ -350 +363 @@
           }
           catch (Exception ex) {
-            Logger.Error("Exception when unloading the appdomain: ", ex);
+            ClientCom.LogMessage("Exception when unloading the appdomain: " + ex.ToString());
           }
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs

@@ -97 +97 @@
               };
 
-              Logger.Debug("Sending Heartbeat: " + heartBeatData);
+              SlaveClientCom.Instance.ClientCom.LogMessage("Sending Heartbeat: " + heartBeatData);
               List<MessageContainer> msgs = wcfService.SendHeartbeat(heartBeatData);
 
               if (msgs == null) {
-                Logger.Debug("Error getting response from Heartbeat");
+                SlaveClientCom.Instance.ClientCom.LogMessage("Error getting response from Heartbeat");
                 OnExceptionOccured(new Exception("Error getting response from Heartbeat"));
               }
 
-              Logger.Debug("Heartbeat Response received: ");
-              msgs.ForEach(mc => Logger.Debug(mc.Message.ToString()));
+              SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Response received: ");
+              msgs.ForEach(mc => SlaveClientCom.Instance.ClientCom.LogMessage(mc.Message.ToString()));
               msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
             }
@@ -112 +112 @@
         }
         catch (Exception e) {
-          Logger.Error("Heartbeat Thread failed badly: " + e.Message);
+          SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Thread failed badly: " + e.Message);
           OnExceptionOccured(e);
         }
@@ -118 +118 @@
       }
       waitHandle.Close();
-      Logger.Debug("Heartbeat thread stopped");
+      SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat thread stopped");
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -64 +64 @@
   <ItemGroup>
     <Compile Include="ConfigManager.cs" />
+    <Compile Include="SlaveClientCom.cs" />
     <Compile Include="Core.cs" />
+    <Compile Include="DummyListener.cs" />
     <Compile Include="Executor.cs" />
     <Compile Include="HeartbeatManager.cs" />
@@ -82 +84 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="ServiceContracts\ISlaveCommunication.cs" />
+    <Compile Include="ServiceContracts\ISlaveCommunicationCallbacks.cs" />
+    <Compile Include="SlaveCommunicationService.cs" />
     <Compile Include="SlaveStatusInfo.cs" />
     <Compile Include="StatusCommons.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
+using System.Threading;
+using HeuristicLab.Clients.Hive.Salve;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.PluginInfrastructure.Manager;
-using System.Threading;
-using System.Reflection;
-using HeuristicLab.Clients.Hive.Salve;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
 
 namespace HeuristicLab.Clients.Hive.Slave {
@@ -127 +126 @@
     internal void PreparePlugins(Job myJob, JobData jobData) {
       lock (locker) {
-        Logger.Debug("Fetching plugins for job");
+        SlaveClientCom.Instance.ClientCom.LogMessage("Fetching plugins for job");
 
         IEnumerable<Plugin> pluginDescriptions = WcfService.Instance.GetPlugins();
@@ -153 +152 @@
           }
           if (!found) {
-            Logger.Debug("Plugin NOT found " + info.Name + ", " + info.Version);
+            SlaveClientCom.Instance.ClientCom.LogMessage("Plugin NOT found " + info.Name + ", " + info.Version);
             missingPlugins.Add(info);
             missingGuids.Add(info.Id);
@@ -160 +159 @@
         }
 
-        Logger.Debug("First run - Update the plugins in the cache");
+        SlaveClientCom.Instance.ClientCom.LogMessage("First run - Update the plugins in the cache");
         localPlugins.AddRange(missingPlugins);
 
@@ -176 +175 @@
             if (pd != null) {
               foreach (IPluginFile ipf in pd.Files) {
-                Logger.Debug(string.Format("deleting {0}", Path.GetFileName(ipf.Name)));
+                SlaveClientCom.Instance.ClientCom.LogMessage(string.Format("deleting {0}", Path.GetFileName(ipf.Name)));
                 File.Delete(ipf.Name);
               }
@@ -195 +194 @@
     internal void DeletePluginsForJob(Guid id) {
       try {
-        Logger.Debug("unloading...");
+        SlaveClientCom.Instance.ClientCom.LogMessage("unloading...");
         int tries = 5;
         while (tries > 0) {
@@ -210 +209 @@
       }
       catch (Exception ex) {
-        Logger.Debug("failed while unloading " + id + " with exception " + ex);
+        SlaveClientCom.Instance.ClientCom.LogMessage("failed while unloading " + id + " with exception " + ex);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Clients.Common;
+using HeuristicLab.Clients.Hive.Slave.Properties;
 using HeuristicLab.Common;
-using HeuristicLab.Clients.Common;
+using HeuristicLab.Services.Hive.Common;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Clients.Hive.Slave.Properties;
 
 namespace HeuristicLab.Clients.Hive.Salve {
@@ -43 +43 @@
       get {
         if (instance == null) {
-          Logger.Debug("New WcfService Instance created");
           instance = new WcfService();
         }
@@ -54 +53 @@
 
     public event EventHandler Connected;
-    public void OnConnected() {
+    private void OnConnected() {
       var handler = Connected;
       if (handler != null) handler(this, EventArgs.Empty);
     }
 
+    public event EventHandler<EventArgs<Exception>> ExceptionOccured;
+    private void OnExceptionOccured(Exception e) {
+      var handler = ExceptionOccured;
+      if (handler != null) handler(this, new EventArgs<Exception>(e));
+    }
+
     /// <summary>
     /// Constructor
@@ -72 +77 @@
       using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
         try {
-          Logger.Debug("Starting the Connection Process");
           ConnState = NetworkEnum.WcfConnState.Connected;
           ConnectedSince = DateTime.Now;
@@ -105 +109 @@
     private void HandleNetworkError(Exception e) {
       ConnState = NetworkEnum.WcfConnState.Failed;
-      Logger.Error("Network exception occurred: " + e);
       OnExceptionOccured(e);
     }
@@ -247 +250 @@
       }
     }
-
-    public event EventHandler<EventArgs<Exception>> ExceptionOccured;
-    private void OnExceptionOccured(Exception e) {
-      Logger.Error("Error: " + e.ToString());
-      var handler = ExceptionOccured;
-      if (handler != null) handler(this, new EventArgs<Exception>(e));
-    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app.config

@@ -13 +13 @@
         </HeuristicLab.Clients.Hive.Slave.Properties.Settings>
     </userSettings>
+
+  <system.serviceModel>
+    <services>
+      <service name="HeuristicLab.Clients.Hive.Slave.SlaveCommunicationService">        
+        <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom"
+                  binding="netNamedPipeBinding"
+                  contract="HeuristicLab.Clients.Hive.Slave.ServiceContracts.ISlaveCommunication"                  
+                   />
+      </service>
+    </services>
+  </system.serviceModel>
+
 </configuration>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/IServiceLocator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Clients.Common;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Clients.Hive {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/PersistenceUtil.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System.IO;
 using HeuristicLab.Persistence.Default.Xml;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

@@ -55 +55 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.Tests-3.4", "HeuristicLab.Services.Hive.Tests\HeuristicLab.Services.Hive.Tests-3.4.csproj", "{17187EAC-5D8C-4B11-9CEA-D88F71B59658}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4", "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj", "{464D70B8-2D91-485C-B622-22E4A4891C68}"
 EndProject
 Global
@@ -179 +181 @@
     {17187EAC-5D8C-4B11-9CEA-D88F71B59658}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     {17187EAC-5D8C-4B11-9CEA-D88F71B59658}.Release|x86.ActiveCfg = Release|Any CPU
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.ActiveCfg = Debug|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.Build.0 = Debug|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Any CPU.ActiveCfg = Release|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Mixed Platforms.Build.0 = Release|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.ActiveCfg = Release|x86
+    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 
 namespace HeuristicLab.Services.Hive.DataAccess {
-  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
   using HeuristicLab.Services.Hive.Common.DataTransfer;
   using HeuristicLab.Services.Hive.DataAccess.Properties;
+  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
   public class HiveDao : IHiveDao {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockAuthorizationManager.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 
 namespace HeuristicLab.Services.Hive.Tests.Mocks {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Services.Hive.Common;
 
 namespace HeuristicLab.Services.Hive.Tests.Mocks {
@@ -10 +29 @@
 
     public void Start() {
-      
+
     }
 
     public void Stop() {
-      
+
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Services.Hive.DataAccess;
 using HeuristicLab.Services.Hive.Tests.Mocks;
-using HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive.Tests {
@@ -24 +41 @@
     private ILifecycleManager lifecycleManager;
     public ILifecycleManager LifecycleManager {
-      get { 
-        return defaultServiceLocator.LifecycleManager; 
+      get {
+        return defaultServiceLocator.LifecycleManager;
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/PluginLoader.cs

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System;
 using System.Collections.Generic;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

@@ -1 @@
-using System;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using HeuristicLab.Clients.Hive;
+using HeuristicLab.Clients.Hive.Slave.Tests;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Clients.Hive.Slave.Tests;
-using HeuristicLab.Clients.Hive;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace HeuristicLab.Services.Hive.Tests {
-  using DA = HeuristicLab.Services.Hive.DataAccess;
-  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.Services.Hive.Common;
   using System.Threading;
   using HeuristicLab.Hive;
+  using HeuristicLab.Services.Hive.Common;
+  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
   [TestClass]