Changeset 4253 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3

Timestamp:

08/18/10 15:29:57 (14 years ago)

Author:

cneumuel

Message:

Rename "Client" to "Slave" #1157

Location:

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

Files:

• ClientConsoleService (deleted)
• ConfigurationManager/AppointmentContainer.cs (modified) (1 diff)
• ConfigurationManager/ClientStatusInfo.cs (deleted)
• ConfigurationManager/ConfigManager.cs (modified) (2 diffs)
• ConfigurationManager/SlaveStatusInfo.cs (added)
• ConfigurationManager/UptimeManager.cs (modified) (2 diffs)
• Core.cs (modified) (6 diffs)
• Heartbeat.cs (modified) (2 diffs)
• JobStorage/JobStorageInfo.cs (modified) (1 diff)
• JobStorage/JobStorageManager.cs (modified) (3 diffs)
• PluginCache.cs (modified) (2 diffs)
• Properties/AssemblyInfo.frame (modified) (1 diff)
• Properties/Settings.Designer.cs (modified) (1 diff)
• Properties/Settings.settings (modified) (1 diff)
• Settings.cs (modified) (1 diff)
• app.config (modified) (2 diffs)

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

@@ -5 +5 @@
 using HeuristicLab.Calendar;
 
-namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
+namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
   public class AppointmentContainer {
     public DateTime Updated { get; set; }

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

@@ -25 +25 @@
 using System.Text;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
-using HeuristicLab.Hive.Client.ExecutionEngine;
-using HeuristicLab.Hive.Client.Core.ClientConsoleService;
-using HeuristicLab.Hive.Client.Communication;
-using HeuristicLab.Hive.Client.Core.Properties;
+using HeuristicLab.Hive.Slave.ExecutionEngine;
+using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
+using HeuristicLab.Hive.Slave.Communication;
+using HeuristicLab.Hive.Slave.Core.Properties;
 using HeuristicLab.Hive.Contracts;
 
-namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
+namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
   /// <summary>
   /// accesses the Server and sends his data (uuid, uptimes, hardware config) 
@@ -111 +111 @@
       st.FreeCores = hardwareInfo.NrOfCores - GetUsedCores();
 
-      st.JobsAborted = ClientStatusInfo.JobsAborted;
-      st.JobsDone = ClientStatusInfo.JobsProcessed;
-      st.JobsFetched = ClientStatusInfo.JobsFetched;      
+      st.JobsAborted = SlaveStatusInfo.JobsAborted;
+      st.JobsDone = SlaveStatusInfo.JobsProcessed;
+      st.JobsFetched = SlaveStatusInfo.JobsFetched;      
 
       Dictionary<Guid, Executor> engines = Core.GetExecutionEngines();

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

@@ -6 +6 @@
 using System.Xml.Serialization;
 using System.IO;
-using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Slave.Common;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Tracing;
 
-namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
+namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
   public class UptimeManager {
 
@@ -24 +24 @@
     public bool CalendarAvailable { get; set; }
 
-    private static String path = System.IO.Directory.GetCurrentDirectory() + "\\plugins\\Hive.Client.Jobs\\";
+    private static String path = System.IO.Directory.GetCurrentDirectory() + "\\plugins\\Hive.Slave.Jobs\\";
 
     private static UptimeManager instance = null;

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

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
-using HeuristicLab.Hive.Client.ExecutionEngine;
-using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Slave.ExecutionEngine;
+using HeuristicLab.Hive.Slave.Common;
 using System.Threading;
 using System.Reflection;
@@ -32 +32 @@
 using System.Security.Policy;
 using System.Security;
-using HeuristicLab.Hive.Client.Communication;
+using HeuristicLab.Hive.Slave.Communication;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
@@ -39 +39 @@
 using System.ServiceModel;
 using System.ServiceModel.Description;
-using HeuristicLab.Hive.Client.Core.ClientConsoleService;
-using HeuristicLab.Hive.Client.Core.ConfigurationManager;
-using HeuristicLab.Hive.Client.Communication.ServerService;
+using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
+using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
+using HeuristicLab.Hive.Slave.Communication.ServerService;
 using HeuristicLab.Hive.JobBase;
-using HeuristicLab.Hive.Client.Core.JobStorage;
+using HeuristicLab.Hive.Slave.Core.JobStorage;
 using HeuristicLab.Tracing;
 using HeuristicLab.Core;
 using System.IO;
 
-namespace HeuristicLab.Hive.Client.Core {
+namespace HeuristicLab.Hive.Slave.Core {
   /// <summary>
   /// The core component of the Hive Client
@@ -79 +79 @@
       abortRequested = false;
       Logger.Info("Hive Client started");
-      ClientConsoleServer server = new ClientConsoleServer();
+      SlaveConsoleServer server = new SlaveConsoleServer();
       server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/ClientConsole/"));
 
@@ -335 +335 @@
               engines.Add(e.Result.Job.Id, engine);
 
-              ClientStatusInfo.JobsFetched++;
-
-              Logger.Info("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+              SlaveStatusInfo.JobsFetched++;
+
+              Logger.Info("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
             }
           }
@@ -361 +361 @@
       KillAppDomain(e.Result.JobId);
       if (e.Result.Success) {
-        ClientStatusInfo.JobsProcessed++;
-        Logger.Info("Increased ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
+        SlaveStatusInfo.JobsProcessed++;
+        Logger.Info("Increased ProcessedJobs to:" + SlaveStatusInfo.JobsProcessed);
       } else {
         Logger.Error("Sending of job " + e.Result.JobId + " failed, job has been wasted. Message: " + e.Result.StatusMessage);

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

@@ -25 +25 @@
 using System.Text;
 using System.Timers;
-using HeuristicLab.Hive.Client.Common;
-using HeuristicLab.Hive.Client.Communication;
+using HeuristicLab.Hive.Slave.Common;
+using HeuristicLab.Hive.Slave.Communication;
 using System.Diagnostics;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
-using HeuristicLab.Hive.Client.Core.ConfigurationManager;
-using HeuristicLab.Hive.Client.Communication.ServerService;
+using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
+using HeuristicLab.Hive.Slave.Communication.ServerService;
 using HeuristicLab.Tracing;
 //using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
 
-namespace HeuristicLab.Hive.Client.Core {
+namespace HeuristicLab.Hive.Slave.Core {
   /// <summary>
   /// Heartbeat class. It sends every x ms a heartbeat to the server and receives a Message
@@ -94 +94 @@
 
         HeartBeatData heartBeatData = new HeartBeatData {
-          ClientId = info.Id,
+          SlaveId = info.Id,
           FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
           FreeMemory = mb,

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

@@ -4 +4 @@
 using System.Text;
 
-namespace HeuristicLab.Hive.Client.Core.JobStorage {
+namespace HeuristicLab.Hive.Slave.Core.JobStorage {
   public class JobStorageInfo {
     public String ServerIP { get; set; }

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

@@ -4 +4 @@
 using System.Text;
 using System.IO;
-using HeuristicLab.Hive.Client.Common;
-using HeuristicLab.Hive.Client.Communication;
-using HeuristicLab.Hive.Client.Core.ConfigurationManager;
+using HeuristicLab.Hive.Slave.Common;
+using HeuristicLab.Hive.Slave.Communication;
+using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
 using HeuristicLab.Hive.Contracts;
 using System.Xml.Serialization;
@@ -13 +13 @@
 using HeuristicLab.Tracing;
 
-namespace HeuristicLab.Hive.Client.Core.JobStorage {
+namespace HeuristicLab.Hive.Slave.Core.JobStorage {
   public class JobStorageManager {
     
     private static List<JobStorageInfo> storedJobsList = new List<JobStorageInfo>();
-    
-    private static String path = System.IO.Directory.GetCurrentDirectory()+"\\Hive.Client.Jobs\\";
+
+    private static String path = System.IO.Directory.GetCurrentDirectory() + "\\Hive.Slave.Jobs\\";
     
     public static void PersistObjectToDisc(String serverIP, long serverPort, Guid jobId, byte[] job) {
@@ -57 +57 @@
                 Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
             }
-            ClientStatusInfo.JobsProcessed++;
+            SlaveStatusInfo.JobsProcessed++;
             storedJobsList.Remove(storedJobsList[index - 1]);
             File.Delete(path + filename + ".dat"); 

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

@@ -4 +4 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
-using HeuristicLab.Hive.Client.Communication;
+using HeuristicLab.Hive.Slave.Communication;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.PluginInfrastructure;
@@ -10 +10 @@
 using HeuristicLab.Tracing;
 
-namespace HeuristicLab.Hive.Client.Core {
+namespace HeuristicLab.Hive.Slave.Core {
   public class PluginCache {
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Properties/AssemblyInfo.frame

@@ -29 +29 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Hive.Client.Core")]
+[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.Core")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]

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

@@ -9 +9 @@
 //------------------------------------------------------------------------------
 
-namespace HeuristicLab.Hive.Client.Core.Properties {
+namespace HeuristicLab.Hive.Slave.Core.Properties {
     
     

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Properties/Settings.settings

@@ -1 +1 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Client.Core.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Slave.Core.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>

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

@@ -1 @@
-namespace HeuristicLab.Hive.Client.Core.Properties {
+namespace HeuristicLab.Hive.Slave.Core.Properties {
     
     

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config

@@ -3 +3 @@
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="HeuristicLab.Hive.Client.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <userSettings>
-        <HeuristicLab.Hive.Client.Core.Properties.Settings>
+      <HeuristicLab.Hive.Slave.Core.Properties.Settings>
             <setting name="Guid" serializeAs="String">
                 <value>00000000-0000-0000-0000-000000000000</value>
@@ -17 +17 @@
                 <value>0</value>
             </setting>
-        </HeuristicLab.Hive.Client.Core.Properties.Settings>
+        </HeuristicLab.Hive.Slave.Core.Properties.Settings>
     </userSettings>
 </configuration>