Changeset 4253

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

Files:

• HeuristicLab.Hive 3.3.sln (modified) (9 diffs)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HeartBeatData.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IClientCommunicator.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IClientFacade.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IClientManager.cs (deleted)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveCommunicator.cs (added)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveFacade.cs (added)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/ISlaveManager.cs (added)
• HeuristicLab.Hive.Contracts/3.3/RecurrentEvent.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/CgCalendar.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Console/3.3/Recurrence.Designer.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/Recurrence.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/Authorization/HivePermissionManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs (deleted)
• HeuristicLab.Hive.Server.Core/3.3/ClientManager.cs (deleted)
• HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs (deleted)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs (modified) (11 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs (added)
• HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IInternalClientCommunicator.cs (deleted)
• HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IInternalSlaveCommunicator.cs (added)
• HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IScheduler.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs (added)
• HeuristicLab.Hive.Server.Core/3.3/SlaveManager.cs (added)
• HeuristicLab.Hive.Server.DataAccess/3.3/IJobDao.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerApplication.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Common/3.3/HeuristicLabHiveClientCommonPlugin.cs (deleted)
• HeuristicLab.Hive.Slave.Common/3.3/HeuristicLabHiveSlaveCommonPlugin.cs (added)
• HeuristicLab.Hive.Slave.Common/3.3/MessageQueue.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Common/3.3/NetworkEnum.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Common/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLabHiveClientCommunicationPlugin.cs (deleted)
• HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLabHiveSlaveCommunicationPlugin.cs (added)
• HeuristicLab.Hive.Slave.Communication/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Hive.Slave.Communication/3.3/SendJobCompletedEventArgs.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.cs (modified) (3 diffs)
• HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj (modified) (8 diffs)
• HeuristicLab.Hive.Slave.Console/3.3/HeuristicLabHiveClientConsoleApplication.cs (deleted)
• HeuristicLab.Hive.Slave.Console/3.3/HeuristicLabHiveClientConsolePlugin.cs (deleted)
• HeuristicLab.Hive.Slave.Console/3.3/HeuristicLabHiveSlaveConsoleApplication.cs (added)
• HeuristicLab.Hive.Slave.Console/3.3/HeuristicLabHiveSlaveConsolePlugin.cs (added)
• HeuristicLab.Hive.Slave.Console/3.3/HiveClientConsole.Designer.cs (deleted)
• HeuristicLab.Hive.Slave.Console/3.3/HiveClientConsole.cs (deleted)
• HeuristicLab.Hive.Slave.Console/3.3/HiveClientConsole.resx (deleted)
• HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs (added)
• HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.designer.cs (added)
• HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.resx (added)
• HeuristicLab.Hive.Slave.Console/3.3/LogFileReader.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Console/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Console/3.3/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Console/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Hive.Slave.Console/3.3/Recurrence.Designer.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Console/3.3/Recurrence.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Console/3.3/Service References/ClientService (deleted)
• HeuristicLab.Hive.Slave.Console/3.3/app.config (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/ClientConsoleService (deleted)
• HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/AppointmentContainer.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ClientStatusInfo.cs (deleted)
• HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/SlaveStatusInfo.cs (added)
• HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (6 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/Heartbeat.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs (modified) (3 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/Settings.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.Core/3.3/app.config (modified) (2 diffs)
• HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs (modified) (2 diffs)
• HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLabHiveClientExecutionEnginePlugin.cs (deleted)
• HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLabHiveSlaveExecutionEnginePlugin.cs (added)
• HeuristicLab.Hive.Slave.ExecutionEngine/3.3/InvalidStateException.cs (modified) (1 diff)
• HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.log4net.xml (modified) (2 diffs)
• HeuristicLab.Hive/3.3/Files.txt (modified) (1 diff)
• HeuristicLab.Hive/3.3/MergeConfigs.cmd (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Core-3.3", "HeuristicLab.Hive.Client.Core\3.3\HeuristicLab.Hive.Client.Core-3.3.csproj", "{5010BD86-23B7-4F8C-888A-76D21AD5266A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Core-3.3", "HeuristicLab.Hive.Server.Core\3.3\HeuristicLab.Hive.Server.Core-3.3.csproj", "{898B31CF-81DC-453B-AEB3-BDF83197A7EE}"
 EndProject
@@ -52 +50 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataAccess.ADOHelper-3.3", "HeuristicLab.DataAccess.ADOHelper\3.3\HeuristicLab.DataAccess.ADOHelper-3.3.csproj", "{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Communication-3.3", "HeuristicLab.Hive.Client.Communication\3.3\HeuristicLab.Hive.Client.Communication-3.3.csproj", "{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Console-3.3", "HeuristicLab.Hive.Client.Console\3.3\HeuristicLab.Hive.Client.Console-3.3.csproj", "{8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.ExecutionEngine-3.3", "HeuristicLab.Hive.Client.ExecutionEngine\3.3\HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Contracts-3.3", "HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj", "{134F93D7-E7C8-4ECD-9923-7F63259A60D8}"
 EndProject
@@ -70 +62 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataAccess-3.3", "HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj", "{9076697B-C151-46CD-95BC-1D059492B478}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Common-3.3", "HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj", "{89F4BC52-C174-481E-9BD2-3814171020E8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.JobBase-3.3", "HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj", "{21187322-52DD-4243-80A4-A85F0263E63B}"
 EndProject
@@ -97 +87 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Tracing-3.3", "HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj", "{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Common-3.3", "HeuristicLab.Hive.Slave.Common\3.3\HeuristicLab.Hive.Slave.Common-3.3.csproj", "{89F4BC52-C174-481E-9BD2-3814171020E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Communication-3.3", "HeuristicLab.Hive.Slave.Communication\3.3\HeuristicLab.Hive.Slave.Communication-3.3.csproj", "{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Console-3.3", "HeuristicLab.Hive.Slave.Console\3.3\HeuristicLab.Hive.Slave.Console-3.3.csproj", "{8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Core-3.3", "HeuristicLab.Hive.Slave.Core\3.3\HeuristicLab.Hive.Slave.Core-3.3.csproj", "{5010BD86-23B7-4F8C-888A-76D21AD5266A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.ExecutionEngine-3.3", "HeuristicLab.Hive.Slave.ExecutionEngine\3.3\HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
 EndProject
 Global
@@ -110 +110 @@
   EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.ActiveCfg = Debug|x64
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.Build.0 = Debug|x64
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.ActiveCfg = Debug|x86
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.Build.0 = Debug|x86
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.Build.0 = Release|Any CPU
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Mixed Platforms.ActiveCfg = Release|x86
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.ActiveCfg = Release|x64
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.Build.0 = Release|x64
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.ActiveCfg = Release|x86
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.Build.0 = Release|x86
     {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -231 +217 @@
     {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.ActiveCfg = Release|x86
     {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.Build.0 = Release|x86
-    {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|Mixed Platforms.ActiveCfg = Debug|x86
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.ActiveCfg = Debug|x64
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.Build.0 = Debug|x64
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|x86
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.Build.0 = Debug|x86
-    {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|Mixed Platforms.ActiveCfg = Release|x86
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.ActiveCfg = Release|x64
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.Build.0 = Release|x64
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|x86
-    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.Build.0 = Release|x86
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.ActiveCfg = Debug|x64
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.Build.0 = Debug|x64
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.Build.0 = Release|Any CPU
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Mixed Platforms.ActiveCfg = Release|x86
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.ActiveCfg = Release|x64
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.Build.0 = Release|x64
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.ActiveCfg = Release|x86
-    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.Build.0 = Release|x86
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.ActiveCfg = Debug|x64
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.Build.0 = Debug|x64
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|x86
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.Build.0 = Debug|x86
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Mixed Platforms.ActiveCfg = Release|x86
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.ActiveCfg = Release|x64
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.Build.0 = Release|x64
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
-    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
     {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -367 +311 @@
     {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.ActiveCfg = Release|x86
     {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.Build.0 = Release|x86
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.ActiveCfg = Debug|x64
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.Build.0 = Debug|x64
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Mixed Platforms.ActiveCfg = Release|x86
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.ActiveCfg = Release|x64
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.Build.0 = Release|x64
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.ActiveCfg = Release|x86
-    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.Build.0 = Release|x86
     {21187322-52DD-4243-80A4-A85F0263E63B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {21187322-52DD-4243-80A4-A85F0263E63B}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -477 +407 @@
     {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}.Release|x64.ActiveCfg = Release|Any CPU
     {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}.Release|x86.ActiveCfg = Release|Any CPU
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.ActiveCfg = Debug|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.Build.0 = Debug|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Mixed Platforms.Build.0 = Release|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.ActiveCfg = Release|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.Build.0 = Release|x64
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.ActiveCfg = Release|x86
+    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.Build.0 = Release|x86
+    {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|Mixed Platforms.ActiveCfg = Debug|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.ActiveCfg = Debug|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.Build.0 = Debug|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|x86
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.Build.0 = Debug|x86
+    {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|Mixed Platforms.ActiveCfg = Release|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Mixed Platforms.Build.0 = Release|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.ActiveCfg = Release|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.Build.0 = Release|x64
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|x86
+    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.Build.0 = Release|x86
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.ActiveCfg = Debug|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.Build.0 = Debug|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Mixed Platforms.Build.0 = Release|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.ActiveCfg = Release|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.Build.0 = Release|x64
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.ActiveCfg = Release|x86
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.Build.0 = Release|x86
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.ActiveCfg = Debug|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.Build.0 = Debug|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.ActiveCfg = Debug|x86
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.Build.0 = Debug|x86
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Mixed Platforms.Build.0 = Release|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.ActiveCfg = Release|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.Build.0 = Release|x64
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.ActiveCfg = Release|x86
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.Build.0 = Release|x86
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.ActiveCfg = Debug|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.Build.0 = Debug|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|x86
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.Build.0 = Debug|x86
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Mixed Platforms.Build.0 = Release|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.ActiveCfg = Release|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.Build.0 = Release|x64
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -482 +492 @@
   EndGlobalSection
   GlobalSection(NestedProjects) = preSolution
+    {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
+    {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
-    {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
-    {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HeartBeatData.cs

@@ -31 +31 @@
   public class HeartBeatData {
     [DataMember]
-    public Guid ClientId { get; set; }
+    public Guid SlaveId { get; set; }
     [DataMember]
     public int FreeMemory { get; set; }
@@ -40 +40 @@
 
     public override string ToString() {
-      String val = "ClientId: " + ClientId + ", FreeCores: " + FreeCores;
+      String val = "SlaveId: " + SlaveId + ", FreeCores: " + FreeCores;
       foreach (KeyValuePair<Guid, double> kvp in JobProgress) {
         val += "\nId" + kvp.Key + " Progress " + kvp.Value;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

@@ -137 +137 @@
     <Compile Include="ResponseSerializedJob.cs" />
     <Compile Include="MultiStream.cs" />
-    <Compile Include="Interfaces\IClientFacade.cs" />
+    <Compile Include="Interfaces\ISlaveFacade.cs" />
     <Compile Include="Interfaces\IExecutionEngineFacade.cs" />
     <Compile Include="ResponseObject.cs" />
-    <Compile Include="Interfaces\IClientManager.cs" />
+    <Compile Include="Interfaces\ISlaveManager.cs" />
     <Compile Include="Interfaces\IJobManager.cs" />
     <Compile Include="Interfaces\ILifecycleManager.cs" />
@@ -147 +147 @@
     <Compile Include="ResponseJob.cs" />
     <Compile Include="HeuristicLabHiveContractsPlugin.cs" />
-    <Compile Include="Interfaces\IClientCommunicator.cs" />
+    <Compile Include="Interfaces\ISlaveCommunicator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Response.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IServerConsoleFacade.cs

@@ -32 +32 @@
   /// </summary>
   [ServiceContract(SessionMode=SessionMode.Required)]
-  public interface IServerConsoleFacade : IClientManager, 
+  public interface IServerConsoleFacade : ISlaveManager, 
     IJobManager {
     [OperationContract]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/RecurrentEvent.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 
-namespace HeuristicLab.Hive.Client.Console
+namespace HeuristicLab.Hive.Slave.Console
 {
   public class RecurrentEvent

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

@@ -45 +45 @@
     ResponseList<ProjectDto> projects = null;
     IJobManager jobManager;
-    IClientManager clientManager; 
+    ISlaveManager clientManager; 
     ResponseList<ClientGroupDto> clientGroups;
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/CgCalendar.cs

@@ -9 +9 @@
 using System.Xml.Serialization;
 using HeuristicLab.Calendar;
-using HeuristicLab.Hive.Client.Console;
+using HeuristicLab.Hive.Slave.Console;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

@@ -76 +76 @@
 
     #region Properties
-    private IClientManager ClientManager {
+    private ISlaveManager ClientManager {
       get {
         try {
@@ -169 +169 @@
       //adding group
       menuItemDeleteGroup.Click += (s, e) => {
-        IClientManager clientManager = ServiceLocator.GetClientManager();
+        ISlaveManager clientManager = ServiceLocator.GetClientManager();
         if (tvClientControl.SelectedNode != null) {
           Response resp = clientManager.DeleteClientGroup(((ClientGroupDto)tvClientControl.SelectedNode.Tag).Id);
@@ -254 +254 @@
     /// <param name="clientgroupID">group of clients</param>
     private void ChangeGroup(Dictionary<ClientDto, Guid> clients, Guid clientgroupID) {
-      IClientManager clientManager = ServiceLocator.GetClientManager();
+      ISlaveManager clientManager = ServiceLocator.GetClientManager();
       foreach (KeyValuePair<ClientDto, Guid> client in clients) {
         if (client.Key.Id != Guid.Empty) {
@@ -696 +696 @@
 
     private void addgroup_addGroupEvent(string name) {
-      IClientManager clientManager = ServiceLocator.GetClientManager();
+      ISlaveManager clientManager = ServiceLocator.GetClientManager();
 
       if (parentgroup != Guid.Empty) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Recurrence.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Hive.Client.Console
+namespace HeuristicLab.Hive.Slave.Console
 {
   partial class Recurrence

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Recurrence.cs

@@ -25 +25 @@
 using HeuristicLab.Hive.Server.ServerConsole;
 
-namespace HeuristicLab.Hive.Client.Console
+namespace HeuristicLab.Hive.Slave.Console
 {
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

@@ -15 +15 @@
     internal static string Port { get; set; }
 
-    internal static IClientManager GetClientManager() {
-      return GetServerConsoleFacade() as IClientManager;
+    internal static ISlaveManager GetClientManager() {
+      return GetServerConsoleFacade() as ISlaveManager;
     }
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Authorization/HivePermissionManager.cs

@@ -19 +19 @@
     private IPermissionManager permManager = ServiceLocator.GetPermissionManager();
 
-    private IClientManager clientManager = ServiceLocator.GetClientManager();
+    private ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
 
     private PermissionCollection permissions = HivePermissions.GetPermissions();
@@ -92 +92 @@
     private bool CheckPermissionHelper(Guid sessionId, Guid actionId, Guid entityId) {
       if (entityId == Guid.Empty) return true;
-      IList<ClientGroupDto> groups = clientManager.GetAllGroupsOfResource(entityId).Obj;
+      IList<ClientGroupDto> groups = slaveManager.GetAllGroupsOfResource(entityId).Obj;
       foreach (ClientGroupDto group in groups)
         if (CheckPermission(sessionId, actionId, group.Id)) return true;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -24 +24 @@
     }
 
-    public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
-      List<JobDto> allOfflineJobsForClient =
-        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.ClientId));
-      return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
+    public bool ExistsJobForSlave(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+      List<JobDto> allOfflineJobsForSlave =
+        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
+      return (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0);
     }
 
-    public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForClient(Guid clientId) {
+    public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForSlave(Guid slaveId) {
       /// Critical section ///
       jobLock.WaitOne();
       JobDto jobToCalculate = null;
       using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
-        ClientDto client = DaoLocator.ClientDao.FindById(clientId);
-        LinkedList<JobDto> allOfflineJobsForClient =
-          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores, client.FreeMemory, client.Id));        
-        if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
-          jobToCalculate = allOfflineJobsForClient.First.Value;
+        ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
+        LinkedList<JobDto> allOfflineJobsForSlave =
+          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));        
+        if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
+          jobToCalculate = allOfflineJobsForSlave.First.Value;
           jobToCalculate.State = State.Calculating;
-          jobToCalculate.Client = client;
+          jobToCalculate.Client = slave;
           jobToCalculate.Client.State = State.Calculating;
           jobToCalculate.DateCalculated = DateTime.Now;
-          DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);
+          DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
           DaoLocator.JobDao.Update(jobToCalculate);
           DaoLocator.ClientDao.Update(jobToCalculate.Client);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -35 +35 @@
 namespace HeuristicLab.Hive.Server.Core {
   public class ServerConsoleFacade : IServerConsoleFacade {
-    private IClientManager clientManager = ServiceLocator.GetClientManager();
+    private ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
 
     private IJobManager jobManager = ServiceLocator.GetJobManager();
@@ -67 +67 @@
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessClients", sessionID, Guid.Empty);
-        return clientManager.GetAllClients();
+        return slaveManager.GetAllClients();
       }
     }
@@ -74 +74 @@
       using (contextFactory.GetContext(false)) {
         //secMan.Authorize("AccessClientGroup", sessionID, Guid.Empty);
-        return clientManager.GetAllClientGroups();
+        return slaveManager.GetAllClientGroups();
       }
     }
@@ -81 +81 @@
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessStatistics", sessionID, Guid.Empty);
-        return clientManager.GetAllUpTimeStatistics();
+        return slaveManager.GetAllUpTimeStatistics();
       }
     }
@@ -88 +88 @@
       using (contextFactory.GetContext()) {
         secMan.Authorize("AddClientGroup", sessionID, Guid.Empty);
-        return clientManager.AddClientGroup(clientGroup);
+        return slaveManager.AddClientGroup(clientGroup);
       }
     }
@@ -95 +95 @@
       using (contextFactory.GetContext()) {
         secMan.Authorize("AddResource", sessionID, Guid.Empty);
-        return clientManager.AddResourceToGroup(clientGroupId, resource);
+        return slaveManager.AddResourceToGroup(clientGroupId, resource);
       }
     }
@@ -101 +101 @@
     public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) {
       using (contextFactory.GetContext()) {
-        return clientManager.DeleteResourceFromGroup(clientGroupId, resourceId);
+        return slaveManager.DeleteResourceFromGroup(clientGroupId, resourceId);
       }
     }
@@ -185 +185 @@
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessUserGroup", sessionID, Guid.Empty);
-        return clientManager.GetAllGroupsOfResource(resourceId);
+        return slaveManager.GetAllGroupsOfResource(resourceId);
       }
     }
@@ -192 +192 @@
       using (contextFactory.GetContext()) {
         secMan.Authorize("DeleteClientGroup", sessionID, Guid.Empty);
-        return clientManager.DeleteClientGroup(clientGroupId);
+        return slaveManager.DeleteClientGroup(clientGroupId);
       }
     }
@@ -233 +233 @@
     public ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid) {
       using (contextFactory.GetContext(false)) {
-        return clientManager.GetUptimeCalendarForResource(guid);
+        return slaveManager.GetUptimeCalendarForResource(guid);
       }
     }
@@ -239 +239 @@
     public Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments, bool isForced) {
       using (contextFactory.GetContext()) {
-        return clientManager.SetUptimeCalendarForResource(guid, appointments, isForced);
+        return slaveManager.SetUptimeCalendarForResource(guid, appointments, isForced);
       }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

@@ -117 +117 @@
     <Compile Include="Authorization\Policy.cs" />
     <Compile Include="Authorization\PolicyCollection.cs" />
-    <Compile Include="ClientCommunicator.cs" />
-    <Compile Include="Facades\ClientFacade.cs" />
-    <Compile Include="ClientManager.cs" />
+    <Compile Include="SlaveCommunicator.cs" />
+    <Compile Include="Facades\SlaveFacade.cs" />
+    <Compile Include="SlaveManager.cs" />
     <Compile Include="DaoLocator.cs" />
     <Compile Include="DefaultScheduler.cs" />
@@ -127 +127 @@
     <Compile Include="HiveServerMessages.Designer.cs" />
     <Compile Include="InternalInterfaces\IHivePermissionManager.cs" />
-    <Compile Include="InternalInterfaces\IInternalClientCommunicator.cs" />
+    <Compile Include="InternalInterfaces\IInternalSlaveCommunicator.cs" />
     <Compile Include="InternalInterfaces\IInternalJobManager.cs" />
     <Compile Include="InternalInterfaces\IScheduler.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IScheduler.cs

@@ -28 +28 @@
 namespace HeuristicLab.Hive.Server.Core.InternalInterfaces {
   public interface IScheduler {
-    bool ExistsJobForClient(HeartBeatData hbData);
-    JobDto GetNextJobForClient(Guid clientId);
+    bool ExistsJobForSlave(HeartBeatData hbData);
+    JobDto GetNextJobForSlave(Guid clientId);
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs

@@ -36 +36 @@
   /// </summary>
   public class ServiceLocator {
-    private static IClientManager clientManager = null;
+    private static ISlaveManager slaveManager = null;
 
     private static IJobManager jobManager = null;
 
-    private static IClientCommunicator clientCommunicator = null;
+    private static ISlaveCommunicator slaveCommunicator = null;
 
     private static ILifecycleManager lifecycleManager = null;
@@ -55 +55 @@
 
     /// <summary>
-    /// Gets the client manager
+    /// Gets the slave manager
     /// </summary>
     /// <returns></returns>
     [MethodImpl(MethodImplOptions.Synchronized)]
-    public static IClientManager GetClientManager() {
-      if (clientManager == null)
-        clientManager = new ClientManager();
+    public static ISlaveManager GetSlaveManager() {
+      if (slaveManager == null)
+        slaveManager = new SlaveManager();
 
-      return clientManager;
+      return slaveManager;
     }
 
@@ -83 +83 @@
     /// <returns></returns>
     [MethodImpl(MethodImplOptions.Synchronized)]
-    public static IClientCommunicator GetClientCommunicator() {
-      if (clientCommunicator == null)
-        clientCommunicator = new ClientCommunicator();
+    public static ISlaveCommunicator GetSlaveCommunicator() {
+      if (slaveCommunicator == null)
+        slaveCommunicator = new SlaveCommunicator();
 
-      return clientCommunicator;
+      return slaveCommunicator;
     }
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/IJobDao.cs

@@ -7 +7 @@
 namespace HeuristicLab.Hive.Server.DataAccess {
   public interface IJobDao: IGenericDao<JobDto> {
-    IEnumerable<JobDto> FindActiveJobsOfClient(ClientDto client);
+    IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto slave);
 
     IEnumerable<JobDto> GetJobsByState(State state);
 
-    void AssignClientToJob(Guid clientId, Guid jobId);
+    void AssignSlaveToJob(Guid slaveId, Guid jobId);
 
     void SetJobOffline(JobDto job);
@@ -19 +19 @@
     byte[] GetBinaryJobFile(Guid jobId); 
 
-    IEnumerable<JobDto> FindFittingJobsForClient(State state, int freeCores, int freeMemory, Guid clientGuid);
+    IEnumerable<JobDto> FindFittingJobsForSlave(State state, int freeCores, int freeMemory, Guid slaveGuid);
     Stream GetSerializedJobStream(Guid jobId);
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

@@ -93 +93 @@
     }
 
-    public IEnumerable<JobDto> FindActiveJobsOfClient(ClientDto client) {
+    public IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto client) {
       return (from j in Context.Jobs
               where (j.JobState == Enum.GetName(typeof (State), State.Calculating) ||
@@ -103 +103 @@
     }
 
-    public IEnumerable<JobDto> FindFittingJobsForClient(State state, int freeCores, int freeMemory, Guid clientId) {
+    public IEnumerable<JobDto> FindFittingJobsForSlave(State state, int freeCores, int freeMemory, Guid clientId) {
       ClientGroupDao cgd = new ClientGroupDao();
       
@@ -126 +126 @@
     }
 
-    public void AssignClientToJob(Guid clientId, Guid jobId) {
+    public void AssignSlaveToJob(Guid clientId, Guid jobId) {
       Client c = Context.Resources.OfType<Client>().SingleOrDefault(client => client.ResourceId.Equals(clientId));
       Job j = Context.Jobs.SingleOrDefault(job => job.JobId.Equals(jobId));

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerApplication.cs

@@ -65 +65 @@
       string curServiceHost = "";
       Uri uriTcp;
-      IClientFacade clientCommunicatorInstance = ApplicationManager.Manager.GetInstances<IClientFacade>().First();
+      ISlaveFacade clientCommunicatorInstance = ApplicationManager.Manager.GetInstances<ISlaveFacade>().First();
       IServerConsoleFacade serverConsoleInstance = ApplicationManager.Manager.GetInstances<IServerConsoleFacade>().First();
       IExecutionEngineFacade executionEngineInstance = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>().First();
@@ -78 +78 @@
           //serviceHost = new ServiceHost(typeof(ClientFacade), uriTcp);
           //serviceHost = new SpringServiceHost("clientFacade", uriTcp);
-          serviceHost.AddServiceEndpoint(typeof(IClientFacade), streamedBinding, STR_ClientCommunicator);
+          serviceHost.AddServiceEndpoint(typeof(ISlaveFacade), streamedBinding, STR_ClientCommunicator);
 
           ServiceDebugBehavior sdb = serviceHost.Description.Behaviors.Find<ServiceDebugBehavior>();

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.Hive.Client.Common</RootNamespace>
-    <AssemblyName>HeuristicLab.Hive.Client.Common-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.Hive.Slave.Common</RootNamespace>
+    <AssemblyName>HeuristicLab.Hive.Slave.Common-3.3</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -118 +118 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HeuristicLabHiveClientCommonPlugin.cs" />
+    <Compile Include="HeuristicLabHiveSlaveCommonPlugin.cs" />
     <Compile Include="MessageQueue.cs" />
     <Compile Include="NetworkEnum.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/MessageQueue.cs

@@ -26 +26 @@
 using HeuristicLab.Hive.Contracts;
 
-namespace HeuristicLab.Hive.Client.Common {
+namespace HeuristicLab.Hive.Slave.Common {
 
   /// <summary>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/NetworkEnum.cs

@@ -25 +25 @@
 using System.Text;
 
-namespace HeuristicLab.Hive.Client.Common {
+namespace HeuristicLab.Hive.Slave.Common {
   public class NetworkEnum {
     public enum WcfConnState { Connected, Disconnected, Failed, Loggedin }  

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/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.Common")]
+[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.Common")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.Hive.Client.Communication</RootNamespace>
-    <AssemblyName>HeuristicLab.Hive.Client.Communication-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.Hive.Slave.Communication</RootNamespace>
+    <AssemblyName>HeuristicLab.Hive.Slave.Communication-3.3</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -82 +82 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
@@ -108 +109 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HeuristicLabHiveClientCommunicationPlugin.cs" />
+    <Compile Include="HeuristicLabHiveSlaveCommunicationPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SendJobCompletedEventArgs.cs" />
@@ -152 +153 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
-      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
-      <Name>HeuristicLab.DataAccess-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
-      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
-      <Name>HeuristicLab.Hive.Client.Common-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
       <Name>HeuristicLab.Hive.Contracts-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Slave.Common\3.3\HeuristicLab.Hive.Slave.Common-3.3.csproj">
+      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
+      <Name>HeuristicLab.Hive.Slave.Common-3.3</Name>
     </ProjectReference>
   </ItemGroup>

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

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

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/SendJobCompletedEventArgs.cs

@@ -21 +21 @@
 using System;
 
-namespace HeuristicLab.Hive.Client.Communication.ServerService {
+namespace HeuristicLab.Hive.Slave.Communication.ServerService {
   public partial class SendJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.cs

@@ -9 +9 @@
 //------------------------------------------------------------------------------
 
-namespace HeuristicLab.Hive.Client.Communication.ServerService {
-    
+namespace HeuristicLab.Hive.Slave.Communication.ServerService {
+    using System.Runtime.Serialization;
+    using System;
+    
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+    [System.Runtime.Serialization.DataContractAttribute(Name="PersistableObject", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess")]
+    [System.SerializableAttribute()]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ClientConfigDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.JobDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ProjectDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.AppointmentDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ResourceDto))]
+    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto))]
+    public partial class PersistableObject : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
+        
+        [System.NonSerializedAttribute()]
+        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private System.Guid IdField;
+        
+        [global::System.ComponentModel.BrowsableAttribute(false)]
+        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
+            get {
+                return this.extensionDataField;
+            }
+            set {
+                this.extensionDataField = value;
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Guid Id {
+            get {
+                return this.IdField;
+            }
+            set {
+                if ((this.IdField.Equals(value) != true)) {
+                    this.IdField = value;
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+        
+        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        
+        protected void RaisePropertyChanged(string propertyName) {
+            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
+            if ((propertyChanged != null)) {
+                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+            }
+        }
+    }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -150 +205 @@
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public interface IClientFacadeChannel : HeuristicLab.Hive.Client.Communication.ServerService.IClientFacade, System.ServiceModel.IClientChannel {
+    public interface IClientFacadeChannel : HeuristicLab.Hive.Slave.Communication.ServerService.IClientFacade, System.ServiceModel.IClientChannel {
     }
     
@@ -421 +476 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public partial class ClientFacadeClient : System.ServiceModel.ClientBase<HeuristicLab.Hive.Client.Communication.ServerService.IClientFacade>, HeuristicLab.Hive.Client.Communication.ServerService.IClientFacade {
+    public partial class ClientFacadeClient : System.ServiceModel.ClientBase<HeuristicLab.Hive.Slave.Communication.ServerService.IClientFacade>, HeuristicLab.Hive.Slave.Communication.ServerService.IClientFacade {
         
         private BeginOperationDelegate onBeginLoginDelegate;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts.Interfaces;
-using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Slave.Common;
 using HeuristicLab.PluginInfrastructure;
 using System.IO;
@@ -34 +34 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 
-namespace HeuristicLab.Hive.Client.Communication {
-  using Service = HeuristicLab.Hive.Client.Communication.ServerService;
-  using HeuristicLab.Hive.Client.Communication.ServerService;
+namespace HeuristicLab.Hive.Slave.Communication {
+  using Service = HeuristicLab.Hive.Slave.Communication.ServerService;
+  using HeuristicLab.Hive.Slave.Communication.ServerService;
 
   /// <summary>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.Hive.Client.Console</RootNamespace>
-    <AssemblyName>HeuristicLab.Hive.Client.Console-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.Hive.Slave.Console</RootNamespace>
+    <AssemblyName>HeuristicLab.Hive.Slave.Console-3.3</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -78 +78 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Calendar-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
@@ -108 +109 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HiveClientConsole.cs">
+    <Compile Include="HiveSlaveConsole.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="HiveClientConsole.designer.cs">
-      <DependentUpon>HiveClientConsole.cs</DependentUpon>
-    </Compile>
-    <Compile Include="HeuristicLabHiveClientConsolePlugin.cs" />
-    <Compile Include="HeuristicLabHiveClientConsoleApplication.cs" />
+    <Compile Include="HiveSlaveConsole.designer.cs">
+      <DependentUpon>HiveSlaveConsole.cs</DependentUpon>
+    </Compile>
+    <Compile Include="HeuristicLabHiveSlaveConsolePlugin.cs" />
+    <Compile Include="HeuristicLabHiveSlaveConsoleApplication.cs" />
     <Compile Include="LogFileReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="HiveClientConsole.resx">
-      <DependentUpon>HiveClientConsole.cs</DependentUpon>
+    <EmbeddedResource Include="HiveSlaveConsole.resx">
+      <DependentUpon>HiveSlaveConsole.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -155 +156 @@
       <DependentUpon>Recurrence.cs</DependentUpon>
     </Compile>
-    <Compile Include="Service References\ClientService\Reference.cs">
+    <Compile Include="Service References\SlaveService\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -162 +163 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Calendar\3.3\HeuristicLab.Calendar-3.3.csproj">
-      <Project>{D17A4D6A-4CAA-4470-8A19-F42463C021FD}</Project>
-      <Name>HeuristicLab.Calendar-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
@@ -176 +173 @@
   <ItemGroup>
     <None Include="Resources\Info.png" />
-    <None Include="Service References\ClientService\HeuristicLab.Calendar.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Common.xsd" />
-    <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd" />
-    <None Include="Service References\ClientService\service.wsdl" />
-    <None Include="Service References\ClientService\service.xsd" />
-    <None Include="Service References\ClientService\service1.xsd" />
+    <None Include="Service References\SlaveService\HeuristicLab.Calendar.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Common1.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Console.SlaveService.ConnectionContainer.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Console.SlaveService.StatusCommons.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Core.ClientConsoleService1.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Core.SlaveConsoleService.xsd" />
+    <None Include="Service References\SlaveService\service.wsdl" />
+    <None Include="Service References\SlaveService\service.xsd" />
+    <None Include="Service References\SlaveService\service1.xsd" />
   </ItemGroup>
   <ItemGroup>
@@ -189 +197 @@
   </ItemGroup>
   <ItemGroup>
-    <WCFMetadataStorage Include="Service References\ClientService\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\ClientService\configuration91.svcinfo" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\ClientService\configuration.svcinfo" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Console.ClientService.ConnectionContainer.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Console.ClientService.StatusCommons.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\ClientService\Reference.svcmap">
+    <WCFMetadataStorage Include="Service References\SlaveService\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Service References\SlaveService\configuration91.svcinfo" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Service References\SlaveService\configuration.svcinfo" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Service References\SlaveService\Reference.svcmap">
       <Generator>WCF Proxy Generator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
@@ -224 +226 @@
   <ItemGroup>
     <None Include="Resources\exit-48.png" />
-    <None Include="Service References\ClientService\System.Drawing1.xsd" />
+    <None Include="Service References\SlaveService\System.Drawing1.xsd" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/LogFileReader.cs

@@ -27 +27 @@
 using System.Diagnostics;
 
-namespace HeuristicLab.Hive.Client.Console {
+namespace HeuristicLab.Hive.Slave.Console {
   class LogFileReader {
     string filename = "";

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

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

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs

@@ -9 +9 @@
 //------------------------------------------------------------------------------
 
-namespace HeuristicLab.Hive.Client.Console.Properties {
+namespace HeuristicLab.Hive.Slave.Console.Properties {
     using System;
     
@@ -40 +40 @@
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Hive.Client.Console.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Hive.Slave.Console.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }

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

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

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/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.Console.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Slave.Console.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Recurrence.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Hive.Client.Console
+namespace HeuristicLab.Hive.Slave.Console
 {
   partial class Recurrence

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Recurrence.cs

@@ -24 +24 @@
 using System.Windows.Forms;
 
-namespace HeuristicLab.Hive.Client.Console
+namespace HeuristicLab.Hive.Slave.Console
 {
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/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.Console.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.Console.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.Console.Properties.Settings>
+         <HeuristicLab.Hive.Slave.Console.Properties.Settings>
             <setting name="IpAdress" serializeAs="String">
                 <value>10.0.0.1</value>
             </setting>
-        </HeuristicLab.Hive.Client.Console.Properties.Settings>
+        </HeuristicLab.Hive.Slave.Console.Properties.Settings>
     </userSettings>
        <system.serviceModel>
               <bindings>
                      <netTcpBinding>
-                            <binding name="NetTcpBinding_IClientConsoleCommunicator" closeTimeout="00:01:00"
+                            <binding name="NetTcpBinding_ISlaveConsoleCommunicator" closeTimeout="00:01:00"
                                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
                                    transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"
@@ -35 +35 @@
               <client>
                      <endpoint address="net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator"
-                            binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IClientConsoleCommunicator"
-                            contract="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator">
+                            binding="netTcpBinding" bindingConfiguration="NetTcpBinding_ISlaveConsoleCommunicator"
+                            contract="SlaveService.ISlaveConsoleCommunicator" name="NetTcpBinding_ISlaveConsoleCommunicator">
                             <identity>
                                    <userPrincipalName value="S0920454044@hagenberg.fhooe.at" />

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>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Slave.Common;
 using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Hive.JobBase;
@@ -31 +31 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Hive.Client.ExecutionEngine {
+namespace HeuristicLab.Hive.Slave.ExecutionEngine {
   public class Executor : MarshalByRefObject, IDisposable {
     public Guid JobId { get; set; }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.Hive.Client.ExecutionEngine</RootNamespace>
-    <AssemblyName>HeuristicLab.Hive.Client.ExecutionEngine-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.Hive.Slave.ExecutionEngine</RootNamespace>
+    <AssemblyName>HeuristicLab.Hive.Slave.ExecutionEngine-3.3</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -101 +101 @@
   <ItemGroup>
     <Compile Include="Executor.cs" />
-    <Compile Include="HeuristicLabHiveClientExecutionEnginePlugin.cs" />
+    <Compile Include="HeuristicLabHiveSlaveExecutionEnginePlugin.cs" />
     <Compile Include="InvalidStateException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -110 +110 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
-      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
-      <Name>HeuristicLab.Hive.Client.Common-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
@@ -121 +117 @@
       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Slave.Common\3.3\HeuristicLab.Hive.Slave.Common-3.3.csproj">
+      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
+      <Name>HeuristicLab.Hive.Slave.Common-3.3</Name>
     </ProjectReference>
   </ItemGroup>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/InvalidStateException.cs

@@ -4 +4 @@
 using System.Text;
 
-namespace HeuristicLab.Hive.Client.ExecutionEngine {
+namespace HeuristicLab.Hive.Slave.ExecutionEngine {
   [global::System.Serializable]
   public class InvalidStateException : Exception {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/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.ExecutionEngine")]
+[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.ExecutionEngine")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.log4net.xml

@@ -27 +27 @@
 
   <appender name="ClientRollingFileAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="Hive.Client.log" />
+    <file value="Hive.Slave.log" />
     <appendToFile value="true" />
     <rollingStyle value="Size" />
@@ -85 +85 @@
   </logger>
 
-  <logger name="HeuristicLab.Hive.Client">
+  <logger name="HeuristicLab.Hive.Slave">
     <level value="DEBUG" />
     <appender-ref ref="ClientBufferingForwardingAppender" />  

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

@@ -7 +7 @@
 HeuristicLab.DataAccess.ADOHelper\3.3:HeuristicLab.DataAccess.ADOHelper-3.3.dll
 
-
-
-HeuristicLab.Hive.Client.Common\3.3:HeuristicLab.Hive.Client.Common-3.3.dll
-HeuristicLab.Hive.Client.Communication\3.3:HeuristicLab.Hive.Client.Communication-3.3.dll
-; HeuristicLab.Hive.Client.Console\3.3:Calendar.DayView.dll
-HeuristicLab.Hive.Client.Console\3.3:HeuristicLab.Hive.Client.Console-3.3.dll
-HeuristicLab.Hive.Client.Console\3.3:ZedGraph.dll
-HeuristicLab.Hive.Client.Core\3.3:HeuristicLab.Hive.Client.Core-3.3.dll
-HeuristicLab.Hive.Client.ExecutionEngine\3.3:HeuristicLab.Hive.Client.ExecutionEngine-3.3.dll
+HeuristicLab.Hive.Slave.Common\3.3:HeuristicLab.Hive.Slave.Common-3.3.dll
+HeuristicLab.Hive.Slave.Communication\3.3:HeuristicLab.Hive.Slave.Communication-3.3.dll
+HeuristicLab.Hive.Slave.Console\3.3:HeuristicLab.Hive.Slave.Console-3.3.dll
+HeuristicLab.Hive.Slave.Console\3.3:ZedGraph.dll
+HeuristicLab.Hive.Slave.Core\3.3:HeuristicLab.Hive.Slave.Core-3.3.dll
+HeuristicLab.Hive.Slave.ExecutionEngine\3.3:HeuristicLab.Hive.Slave.ExecutionEngine-3.3.dll
 
 HeuristicLab.Hive.Engine\3.3:HeuristicLab.Hive.Engine-3.3.dll

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

@@ -1 +1 @@
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.LINQDataAccess\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
-ConfigMerger "%SolutionDir%HeuristicLab.Hive.Client.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
+ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Experiment\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Tracing\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"