Changeset 4253


Ignore:
Timestamp:
08/18/10 15:29:57 (12 years ago)
Author:
cneumuel
Message:

Rename "Client" to "Slave" #1157

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
16 added
18 deleted
58 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4247 r4253  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 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}"
    5 EndProject
    64Project("{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}"
    75EndProject
     
    5250Project("{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}"
    5351EndProject
    54 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}"
    55 EndProject
    56 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}"
    57 EndProject
    58 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}"
    59 EndProject
    6052Project("{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}"
    6153EndProject
     
    7062Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataAccess-3.3", "HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj", "{9076697B-C151-46CD-95BC-1D059492B478}"
    7163EndProject
    72 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}"
    73 EndProject
    7464Project("{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}"
    7565EndProject
     
    9787EndProject
    9888Project("{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}"
     89EndProject
     90Project("{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}"
     91EndProject
     92Project("{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}"
     93EndProject
     94Project("{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}"
     95EndProject
     96Project("{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}"
     97EndProject
     98Project("{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}"
    9999EndProject
    100100Global
     
    110110  EndGlobalSection
    111111  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    112     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    113     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    114     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    115     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.ActiveCfg = Debug|x64
    116     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.Build.0 = Debug|x64
    117     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.ActiveCfg = Debug|x86
    118     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.Build.0 = Debug|x86
    119     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    120     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.Build.0 = Release|Any CPU
    121     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Mixed Platforms.ActiveCfg = Release|x86
    122     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.ActiveCfg = Release|x64
    123     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.Build.0 = Release|x64
    124     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.ActiveCfg = Release|x86
    125     {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.Build.0 = Release|x86
    126112    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    127113    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    231217    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.ActiveCfg = Release|x86
    232218    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.Build.0 = Release|x86
    233     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    234     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
    235     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    236     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.ActiveCfg = Debug|x64
    237     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.Build.0 = Debug|x64
    238     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|x86
    239     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.Build.0 = Debug|x86
    240     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    241     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.Build.0 = Release|Any CPU
    242     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Mixed Platforms.ActiveCfg = Release|x86
    243     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.ActiveCfg = Release|x64
    244     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.Build.0 = Release|x64
    245     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|x86
    246     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.Build.0 = Release|x86
    247     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    248     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    249     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    250     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.ActiveCfg = Debug|x64
    251     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.Build.0 = Debug|x64
    252     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
    253     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86
    254     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    255     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.Build.0 = Release|Any CPU
    256     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Mixed Platforms.ActiveCfg = Release|x86
    257     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.ActiveCfg = Release|x64
    258     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.Build.0 = Release|x64
    259     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.ActiveCfg = Release|x86
    260     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.Build.0 = Release|x86
    261     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    262     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.Build.0 = Debug|Any CPU
    263     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    264     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.ActiveCfg = Debug|x64
    265     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.Build.0 = Debug|x64
    266     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|x86
    267     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.Build.0 = Debug|x86
    268     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
    269     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
    270     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Mixed Platforms.ActiveCfg = Release|x86
    271     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.ActiveCfg = Release|x64
    272     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.Build.0 = Release|x64
    273     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
    274     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
    275219    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    276220    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    367311    {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.ActiveCfg = Release|x86
    368312    {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.Build.0 = Release|x86
    369     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    370     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
    371     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    372     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.ActiveCfg = Debug|x64
    373     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.Build.0 = Debug|x64
    374     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
    375     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
    376     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    377     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
    378     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Mixed Platforms.ActiveCfg = Release|x86
    379     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.ActiveCfg = Release|x64
    380     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.Build.0 = Release|x64
    381     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.ActiveCfg = Release|x86
    382     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.Build.0 = Release|x86
    383313    {21187322-52DD-4243-80A4-A85F0263E63B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    384314    {21187322-52DD-4243-80A4-A85F0263E63B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    477407    {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}.Release|x64.ActiveCfg = Release|Any CPU
    478408    {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}.Release|x86.ActiveCfg = Release|Any CPU
     409    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     410    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     411    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     412    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Mixed Platforms.Build.0 = Debug|x64
     413    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.ActiveCfg = Debug|x64
     414    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.Build.0 = Debug|x64
     415    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
     416    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
     417    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     418    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
     419    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Mixed Platforms.ActiveCfg = Release|x64
     420    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Mixed Platforms.Build.0 = Release|x64
     421    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.ActiveCfg = Release|x64
     422    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.Build.0 = Release|x64
     423    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.ActiveCfg = Release|x86
     424    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.Build.0 = Release|x86
     425    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     426    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
     427    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     428    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Mixed Platforms.Build.0 = Debug|x64
     429    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.ActiveCfg = Debug|x64
     430    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.Build.0 = Debug|x64
     431    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|x86
     432    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.Build.0 = Debug|x86
     433    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
     434    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.Build.0 = Release|Any CPU
     435    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Mixed Platforms.ActiveCfg = Release|x64
     436    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Mixed Platforms.Build.0 = Release|x64
     437    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.ActiveCfg = Release|x64
     438    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.Build.0 = Release|x64
     439    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|x86
     440    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.Build.0 = Release|x86
     441    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     442    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     443    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     444    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Mixed Platforms.Build.0 = Debug|x64
     445    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.ActiveCfg = Debug|x64
     446    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.Build.0 = Debug|x64
     447    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
     448    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86
     449    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     450    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.Build.0 = Release|Any CPU
     451    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Mixed Platforms.ActiveCfg = Release|x64
     452    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Mixed Platforms.Build.0 = Release|x64
     453    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.ActiveCfg = Release|x64
     454    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.Build.0 = Release|x64
     455    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.ActiveCfg = Release|x86
     456    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.Build.0 = Release|x86
     457    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     458    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     459    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     460    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|Mixed Platforms.Build.0 = Debug|x64
     461    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.ActiveCfg = Debug|x64
     462    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x64.Build.0 = Debug|x64
     463    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.ActiveCfg = Debug|x86
     464    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.Build.0 = Debug|x86
     465    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     466    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.Build.0 = Release|Any CPU
     467    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Mixed Platforms.ActiveCfg = Release|x64
     468    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Mixed Platforms.Build.0 = Release|x64
     469    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.ActiveCfg = Release|x64
     470    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x64.Build.0 = Release|x64
     471    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.ActiveCfg = Release|x86
     472    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|x86.Build.0 = Release|x86
     473    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     474    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.Build.0 = Debug|Any CPU
     475    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     476    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Mixed Platforms.Build.0 = Debug|x64
     477    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.ActiveCfg = Debug|x64
     478    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.Build.0 = Debug|x64
     479    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|x86
     480    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.Build.0 = Debug|x86
     481    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
     482    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
     483    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Mixed Platforms.ActiveCfg = Release|x64
     484    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Mixed Platforms.Build.0 = Release|x64
     485    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.ActiveCfg = Release|x64
     486    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.Build.0 = Release|x64
     487    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
     488    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
    479489  EndGlobalSection
    480490  GlobalSection(SolutionProperties) = preSolution
     
    482492  EndGlobalSection
    483493  GlobalSection(NestedProjects) = preSolution
     494    {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    484495    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    485496    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     497    {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    486498    {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    487     {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    488     {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    489499    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    490500    {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

    r2607 r4253  
    3131  public class HeartBeatData {
    3232    [DataMember]
    33     public Guid ClientId { get; set; }
     33    public Guid SlaveId { get; set; }
    3434    [DataMember]
    3535    public int FreeMemory { get; set; }
     
    4040
    4141    public override string ToString() {
    42       String val = "ClientId: " + ClientId + ", FreeCores: " + FreeCores;
     42      String val = "SlaveId: " + SlaveId + ", FreeCores: " + FreeCores;
    4343      foreach (KeyValuePair<Guid, double> kvp in JobProgress) {
    4444        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

    r4171 r4253  
    137137    <Compile Include="ResponseSerializedJob.cs" />
    138138    <Compile Include="MultiStream.cs" />
    139     <Compile Include="Interfaces\IClientFacade.cs" />
     139    <Compile Include="Interfaces\ISlaveFacade.cs" />
    140140    <Compile Include="Interfaces\IExecutionEngineFacade.cs" />
    141141    <Compile Include="ResponseObject.cs" />
    142     <Compile Include="Interfaces\IClientManager.cs" />
     142    <Compile Include="Interfaces\ISlaveManager.cs" />
    143143    <Compile Include="Interfaces\IJobManager.cs" />
    144144    <Compile Include="Interfaces\ILifecycleManager.cs" />
     
    147147    <Compile Include="ResponseJob.cs" />
    148148    <Compile Include="HeuristicLabHiveContractsPlugin.cs" />
    149     <Compile Include="Interfaces\IClientCommunicator.cs" />
     149    <Compile Include="Interfaces\ISlaveCommunicator.cs" />
    150150    <Compile Include="Properties\AssemblyInfo.cs" />
    151151    <Compile Include="Response.cs" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IServerConsoleFacade.cs

    r1377 r4253  
    3232  /// </summary>
    3333  [ServiceContract(SessionMode=SessionMode.Required)]
    34   public interface IServerConsoleFacade : IClientManager,
     34  public interface IServerConsoleFacade : ISlaveManager,
    3535    IJobManager {
    3636    [OperationContract]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/RecurrentEvent.cs

    r3022 r4253  
    2323using System.Collections.Generic;
    2424
    25 namespace HeuristicLab.Hive.Client.Console
     25namespace HeuristicLab.Hive.Slave.Console
    2626{
    2727  public class RecurrentEvent
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

    r4116 r4253  
    4545    ResponseList<ProjectDto> projects = null;
    4646    IJobManager jobManager;
    47     IClientManager clientManager;
     47    ISlaveManager clientManager;
    4848    ResponseList<ClientGroupDto> clientGroups;
    4949
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/CgCalendar.cs

    r4105 r4253  
    99using System.Xml.Serialization;
    1010using HeuristicLab.Calendar;
    11 using HeuristicLab.Hive.Client.Console;
     11using HeuristicLab.Hive.Slave.Console;
    1212using HeuristicLab.Hive.Contracts.BusinessObjects;
    1313using HeuristicLab.Hive.Contracts;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

    r4116 r4253  
    7676
    7777    #region Properties
    78     private IClientManager ClientManager {
     78    private ISlaveManager ClientManager {
    7979      get {
    8080        try {
     
    169169      //adding group
    170170      menuItemDeleteGroup.Click += (s, e) => {
    171         IClientManager clientManager = ServiceLocator.GetClientManager();
     171        ISlaveManager clientManager = ServiceLocator.GetClientManager();
    172172        if (tvClientControl.SelectedNode != null) {
    173173          Response resp = clientManager.DeleteClientGroup(((ClientGroupDto)tvClientControl.SelectedNode.Tag).Id);
     
    254254    /// <param name="clientgroupID">group of clients</param>
    255255    private void ChangeGroup(Dictionary<ClientDto, Guid> clients, Guid clientgroupID) {
    256       IClientManager clientManager = ServiceLocator.GetClientManager();
     256      ISlaveManager clientManager = ServiceLocator.GetClientManager();
    257257      foreach (KeyValuePair<ClientDto, Guid> client in clients) {
    258258        if (client.Key.Id != Guid.Empty) {
     
    696696
    697697    private void addgroup_addGroupEvent(string name) {
    698       IClientManager clientManager = ServiceLocator.GetClientManager();
     698      ISlaveManager clientManager = ServiceLocator.GetClientManager();
    699699
    700700      if (parentgroup != Guid.Empty) {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Recurrence.Designer.cs

    r3022 r4253  
    1 namespace HeuristicLab.Hive.Client.Console
     1namespace HeuristicLab.Hive.Slave.Console
    22{
    33  partial class Recurrence
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Recurrence.cs

    r3022 r4253  
    2525using HeuristicLab.Hive.Server.ServerConsole;
    2626
    27 namespace HeuristicLab.Hive.Client.Console
     27namespace HeuristicLab.Hive.Slave.Console
    2828{
    2929
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

    r4042 r4253  
    1515    internal static string Port { get; set; }
    1616
    17     internal static IClientManager GetClientManager() {
    18       return GetServerConsoleFacade() as IClientManager;
     17    internal static ISlaveManager GetClientManager() {
     18      return GetServerConsoleFacade() as ISlaveManager;
    1919    }
    2020
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Authorization/HivePermissionManager.cs

    r4060 r4253  
    1919    private IPermissionManager permManager = ServiceLocator.GetPermissionManager();
    2020
    21     private IClientManager clientManager = ServiceLocator.GetClientManager();
     21    private ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
    2222
    2323    private PermissionCollection permissions = HivePermissions.GetPermissions();
     
    9292    private bool CheckPermissionHelper(Guid sessionId, Guid actionId, Guid entityId) {
    9393      if (entityId == Guid.Empty) return true;
    94       IList<ClientGroupDto> groups = clientManager.GetAllGroupsOfResource(entityId).Obj;
     94      IList<ClientGroupDto> groups = slaveManager.GetAllGroupsOfResource(entityId).Obj;
    9595      foreach (ClientGroupDto group in groups)
    9696        if (CheckPermission(sessionId, actionId, group.Id)) return true;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

    r4121 r4253  
    2424    }
    2525
    26     public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
    27       List<JobDto> allOfflineJobsForClient =
    28         new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.ClientId));
    29       return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
     26    public bool ExistsJobForSlave(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
     27      List<JobDto> allOfflineJobsForSlave =
     28        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
     29      return (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0);
    3030    }
    3131
    32     public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForClient(Guid clientId) {
     32    public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForSlave(Guid slaveId) {
    3333      /// Critical section ///
    3434      jobLock.WaitOne();
    3535      JobDto jobToCalculate = null;
    3636      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
    37         ClientDto client = DaoLocator.ClientDao.FindById(clientId);
    38         LinkedList<JobDto> allOfflineJobsForClient =
    39           new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores, client.FreeMemory, client.Id));       
    40         if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
    41           jobToCalculate = allOfflineJobsForClient.First.Value;
     37        ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
     38        LinkedList<JobDto> allOfflineJobsForSlave =
     39          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));       
     40        if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
     41          jobToCalculate = allOfflineJobsForSlave.First.Value;
    4242          jobToCalculate.State = State.Calculating;
    43           jobToCalculate.Client = client;
     43          jobToCalculate.Client = slave;
    4444          jobToCalculate.Client.State = State.Calculating;
    4545          jobToCalculate.DateCalculated = DateTime.Now;
    46           DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);
     46          DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
    4747          DaoLocator.JobDao.Update(jobToCalculate);
    4848          DaoLocator.ClientDao.Update(jobToCalculate.Client);
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

    r4170 r4253  
    3535namespace HeuristicLab.Hive.Server.Core {
    3636  public class ServerConsoleFacade : IServerConsoleFacade {
    37     private IClientManager clientManager = ServiceLocator.GetClientManager();
     37    private ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
    3838
    3939    private IJobManager jobManager = ServiceLocator.GetJobManager();
     
    6767      using (contextFactory.GetContext(false)) {
    6868        secMan.Authorize("AccessClients", sessionID, Guid.Empty);
    69         return clientManager.GetAllClients();
     69        return slaveManager.GetAllClients();
    7070      }
    7171    }
     
    7474      using (contextFactory.GetContext(false)) {
    7575        //secMan.Authorize("AccessClientGroup", sessionID, Guid.Empty);
    76         return clientManager.GetAllClientGroups();
     76        return slaveManager.GetAllClientGroups();
    7777      }
    7878    }
     
    8181      using (contextFactory.GetContext(false)) {
    8282        secMan.Authorize("AccessStatistics", sessionID, Guid.Empty);
    83         return clientManager.GetAllUpTimeStatistics();
     83        return slaveManager.GetAllUpTimeStatistics();
    8484      }
    8585    }
     
    8888      using (contextFactory.GetContext()) {
    8989        secMan.Authorize("AddClientGroup", sessionID, Guid.Empty);
    90         return clientManager.AddClientGroup(clientGroup);
     90        return slaveManager.AddClientGroup(clientGroup);
    9191      }
    9292    }
     
    9595      using (contextFactory.GetContext()) {
    9696        secMan.Authorize("AddResource", sessionID, Guid.Empty);
    97         return clientManager.AddResourceToGroup(clientGroupId, resource);
     97        return slaveManager.AddResourceToGroup(clientGroupId, resource);
    9898      }
    9999    }
     
    101101    public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) {
    102102      using (contextFactory.GetContext()) {
    103         return clientManager.DeleteResourceFromGroup(clientGroupId, resourceId);
     103        return slaveManager.DeleteResourceFromGroup(clientGroupId, resourceId);
    104104      }
    105105    }
     
    185185      using (contextFactory.GetContext(false)) {
    186186        secMan.Authorize("AccessUserGroup", sessionID, Guid.Empty);
    187         return clientManager.GetAllGroupsOfResource(resourceId);
     187        return slaveManager.GetAllGroupsOfResource(resourceId);
    188188      }
    189189    }
     
    192192      using (contextFactory.GetContext()) {
    193193        secMan.Authorize("DeleteClientGroup", sessionID, Guid.Empty);
    194         return clientManager.DeleteClientGroup(clientGroupId);
     194        return slaveManager.DeleteClientGroup(clientGroupId);
    195195      }
    196196    }
     
    233233    public ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid) {
    234234      using (contextFactory.GetContext(false)) {
    235         return clientManager.GetUptimeCalendarForResource(guid);
     235        return slaveManager.GetUptimeCalendarForResource(guid);
    236236      }
    237237    }
     
    239239    public Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments, bool isForced) {
    240240      using (contextFactory.GetContext()) {
    241         return clientManager.SetUptimeCalendarForResource(guid, appointments, isForced);
     241        return slaveManager.SetUptimeCalendarForResource(guid, appointments, isForced);
    242242      }
    243243    }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

    r4171 r4253  
    117117    <Compile Include="Authorization\Policy.cs" />
    118118    <Compile Include="Authorization\PolicyCollection.cs" />
    119     <Compile Include="ClientCommunicator.cs" />
    120     <Compile Include="Facades\ClientFacade.cs" />
    121     <Compile Include="ClientManager.cs" />
     119    <Compile Include="SlaveCommunicator.cs" />
     120    <Compile Include="Facades\SlaveFacade.cs" />
     121    <Compile Include="SlaveManager.cs" />
    122122    <Compile Include="DaoLocator.cs" />
    123123    <Compile Include="DefaultScheduler.cs" />
     
    127127    <Compile Include="HiveServerMessages.Designer.cs" />
    128128    <Compile Include="InternalInterfaces\IHivePermissionManager.cs" />
    129     <Compile Include="InternalInterfaces\IInternalClientCommunicator.cs" />
     129    <Compile Include="InternalInterfaces\IInternalSlaveCommunicator.cs" />
    130130    <Compile Include="InternalInterfaces\IInternalJobManager.cs" />
    131131    <Compile Include="InternalInterfaces\IScheduler.cs" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/InternalInterfaces/IScheduler.cs

    r4060 r4253  
    2828namespace HeuristicLab.Hive.Server.Core.InternalInterfaces {
    2929  public interface IScheduler {
    30     bool ExistsJobForClient(HeartBeatData hbData);
    31     JobDto GetNextJobForClient(Guid clientId);
     30    bool ExistsJobForSlave(HeartBeatData hbData);
     31    JobDto GetNextJobForSlave(Guid clientId);
    3232  }
    3333}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs

    r4092 r4253  
    3636  /// </summary>
    3737  public class ServiceLocator {
    38     private static IClientManager clientManager = null;
     38    private static ISlaveManager slaveManager = null;
    3939
    4040    private static IJobManager jobManager = null;
    4141
    42     private static IClientCommunicator clientCommunicator = null;
     42    private static ISlaveCommunicator slaveCommunicator = null;
    4343
    4444    private static ILifecycleManager lifecycleManager = null;
     
    5555
    5656    /// <summary>
    57     /// Gets the client manager
     57    /// Gets the slave manager
    5858    /// </summary>
    5959    /// <returns></returns>
    6060    [MethodImpl(MethodImplOptions.Synchronized)]
    61     public static IClientManager GetClientManager() {
    62       if (clientManager == null)
    63         clientManager = new ClientManager();
     61    public static ISlaveManager GetSlaveManager() {
     62      if (slaveManager == null)
     63        slaveManager = new SlaveManager();
    6464
    65       return clientManager;
     65      return slaveManager;
    6666    }
    6767
     
    8383    /// <returns></returns>
    8484    [MethodImpl(MethodImplOptions.Synchronized)]
    85     public static IClientCommunicator GetClientCommunicator() {
    86       if (clientCommunicator == null)
    87         clientCommunicator = new ClientCommunicator();
     85    public static ISlaveCommunicator GetSlaveCommunicator() {
     86      if (slaveCommunicator == null)
     87        slaveCommunicator = new SlaveCommunicator();
    8888
    89       return clientCommunicator;
     89      return slaveCommunicator;
    9090    }
    9191
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/IJobDao.cs

    r4170 r4253  
    77namespace HeuristicLab.Hive.Server.DataAccess {
    88  public interface IJobDao: IGenericDao<JobDto> {
    9     IEnumerable<JobDto> FindActiveJobsOfClient(ClientDto client);
     9    IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto slave);
    1010
    1111    IEnumerable<JobDto> GetJobsByState(State state);
    1212
    13     void AssignClientToJob(Guid clientId, Guid jobId);
     13    void AssignSlaveToJob(Guid slaveId, Guid jobId);
    1414
    1515    void SetJobOffline(JobDto job);
     
    1919    byte[] GetBinaryJobFile(Guid jobId);
    2020
    21     IEnumerable<JobDto> FindFittingJobsForClient(State state, int freeCores, int freeMemory, Guid clientGuid);
     21    IEnumerable<JobDto> FindFittingJobsForSlave(State state, int freeCores, int freeMemory, Guid slaveGuid);
    2222    Stream GetSerializedJobStream(Guid jobId);
    2323
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

    r4170 r4253  
    9393    }
    9494
    95     public IEnumerable<JobDto> FindActiveJobsOfClient(ClientDto client) {
     95    public IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto client) {
    9696      return (from j in Context.Jobs
    9797              where (j.JobState == Enum.GetName(typeof (State), State.Calculating) ||
     
    103103    }
    104104
    105     public IEnumerable<JobDto> FindFittingJobsForClient(State state, int freeCores, int freeMemory, Guid clientId) {
     105    public IEnumerable<JobDto> FindFittingJobsForSlave(State state, int freeCores, int freeMemory, Guid clientId) {
    106106      ClientGroupDao cgd = new ClientGroupDao();
    107107     
     
    126126    }
    127127
    128     public void AssignClientToJob(Guid clientId, Guid jobId) {
     128    public void AssignSlaveToJob(Guid clientId, Guid jobId) {
    129129      Client c = Context.Resources.OfType<Client>().SingleOrDefault(client => client.ResourceId.Equals(clientId));
    130130      Job j = Context.Jobs.SingleOrDefault(job => job.JobId.Equals(jobId));
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerApplication.cs

    r4171 r4253  
    6565      string curServiceHost = "";
    6666      Uri uriTcp;
    67       IClientFacade clientCommunicatorInstance = ApplicationManager.Manager.GetInstances<IClientFacade>().First();
     67      ISlaveFacade clientCommunicatorInstance = ApplicationManager.Manager.GetInstances<ISlaveFacade>().First();
    6868      IServerConsoleFacade serverConsoleInstance = ApplicationManager.Manager.GetInstances<IServerConsoleFacade>().First();
    6969      IExecutionEngineFacade executionEngineInstance = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>().First();
     
    7878          //serviceHost = new ServiceHost(typeof(ClientFacade), uriTcp);
    7979          //serviceHost = new SpringServiceHost("clientFacade", uriTcp);
    80           serviceHost.AddServiceEndpoint(typeof(IClientFacade), streamedBinding, STR_ClientCommunicator);
     80          serviceHost.AddServiceEndpoint(typeof(ISlaveFacade), streamedBinding, STR_ClientCommunicator);
    8181
    8282          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

    r4248 r4253  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Hive.Client.Common</RootNamespace>
    12     <AssemblyName>HeuristicLab.Hive.Client.Common-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Hive.Slave.Common</RootNamespace>
     12    <AssemblyName>HeuristicLab.Hive.Slave.Common-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     
    118118  </ItemGroup>
    119119  <ItemGroup>
    120     <Compile Include="HeuristicLabHiveClientCommonPlugin.cs" />
     120    <Compile Include="HeuristicLabHiveSlaveCommonPlugin.cs" />
    121121    <Compile Include="MessageQueue.cs" />
    122122    <Compile Include="NetworkEnum.cs" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/MessageQueue.cs

    r1775 r4253  
    2626using HeuristicLab.Hive.Contracts;
    2727
    28 namespace HeuristicLab.Hive.Client.Common {
     28namespace HeuristicLab.Hive.Slave.Common {
    2929
    3030  /// <summary>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/NetworkEnum.cs

    r1530 r4253  
    2525using System.Text;
    2626
    27 namespace HeuristicLab.Hive.Client.Common {
     27namespace HeuristicLab.Hive.Slave.Common {
    2828  public class NetworkEnum {
    2929    public enum WcfConnState { Connected, Disconnected, Failed, Loggedin } 
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/Properties/AssemblyInfo.frame

    r4171 r4253  
    2929// set of attributes. Change these attribute values to modify the information
    3030// associated with an assembly.
    31 [assembly: AssemblyTitle("HeuristicLab.Hive.Client.Common")]
     31[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.Common")]
    3232[assembly: AssemblyDescription("")]
    3333[assembly: AssemblyConfiguration("")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

    r4248 r4253  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Hive.Client.Communication</RootNamespace>
    12     <AssemblyName>HeuristicLab.Hive.Client.Communication-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Hive.Slave.Communication</RootNamespace>
     12    <AssemblyName>HeuristicLab.Hive.Slave.Communication-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     
    8282      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    8383    </Reference>
     84    <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    8485    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    8586      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     
    108109  </ItemGroup>
    109110  <ItemGroup>
    110     <Compile Include="HeuristicLabHiveClientCommunicationPlugin.cs" />
     111    <Compile Include="HeuristicLabHiveSlaveCommunicationPlugin.cs" />
    111112    <Compile Include="Properties\AssemblyInfo.cs" />
    112113    <Compile Include="SendJobCompletedEventArgs.cs" />
     
    152153  </ItemGroup>
    153154  <ItemGroup>
    154     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    155       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    156       <Name>HeuristicLab.DataAccess-3.3</Name>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
    159       <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
    160       <Name>HeuristicLab.Hive.Client.Common-3.3</Name>
    161     </ProjectReference>
    162155    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    163156      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    164157      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
     158    </ProjectReference>
     159    <ProjectReference Include="..\..\HeuristicLab.Hive.Slave.Common\3.3\HeuristicLab.Hive.Slave.Common-3.3.csproj">
     160      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
     161      <Name>HeuristicLab.Hive.Slave.Common-3.3</Name>
    165162    </ProjectReference>
    166163  </ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Properties/AssemblyInfo.frame

    r4171 r4253  
    2828// set of attributes. Change these attribute values to modify the information
    2929// associated with an assembly.
    30 [assembly: AssemblyTitle("HeuristicLab.Hive.Client.Communication")]
     30[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.Communication")]
    3131[assembly: AssemblyDescription("")]
    3232[assembly: AssemblyConfiguration("")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/SendJobCompletedEventArgs.cs

    r4107 r4253  
    2121using System;
    2222
    23 namespace HeuristicLab.Hive.Client.Communication.ServerService {
     23namespace HeuristicLab.Hive.Slave.Communication.ServerService {
    2424  public partial class SendJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    2525
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.cs

    r4170 r4253  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Client.Communication.ServerService {
    12    
     11namespace HeuristicLab.Hive.Slave.Communication.ServerService {
     12    using System.Runtime.Serialization;
     13    using System;
     14   
     15   
     16    [System.Diagnostics.DebuggerStepThroughAttribute()]
     17    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     18    [System.Runtime.Serialization.DataContractAttribute(Name="PersistableObject", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess")]
     19    [System.SerializableAttribute()]
     20    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ClientConfigDto))]
     21    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.JobDto))]
     22    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfoDto))]
     23    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto))]
     24    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ProjectDto))]
     25    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.AppointmentDto))]
     26    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ResourceDto))]
     27    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Hive.Contracts.BusinessObjects.ClientDto))]
     28    public partial class PersistableObject : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
     29       
     30        [System.NonSerializedAttribute()]
     31        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
     32       
     33        [System.Runtime.Serialization.OptionalFieldAttribute()]
     34        private System.Guid IdField;
     35       
     36        [global::System.ComponentModel.BrowsableAttribute(false)]
     37        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
     38            get {
     39                return this.extensionDataField;
     40            }
     41            set {
     42                this.extensionDataField = value;
     43            }
     44        }
     45       
     46        [System.Runtime.Serialization.DataMemberAttribute()]
     47        public System.Guid Id {
     48            get {
     49                return this.IdField;
     50            }
     51            set {
     52                if ((this.IdField.Equals(value) != true)) {
     53                    this.IdField = value;
     54                    this.RaisePropertyChanged("Id");
     55                }
     56            }
     57        }
     58       
     59        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
     60       
     61        protected void RaisePropertyChanged(string propertyName) {
     62            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
     63            if ((propertyChanged != null)) {
     64                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
     65            }
     66        }
     67    }
    1368   
    1469    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     
    150205   
    151206    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    152     public interface IClientFacadeChannel : HeuristicLab.Hive.Client.Communication.ServerService.IClientFacade, System.ServiceModel.IClientChannel {
     207    public interface IClientFacadeChannel : HeuristicLab.Hive.Slave.Communication.ServerService.IClientFacade, System.ServiceModel.IClientChannel {
    153208    }
    154209   
     
    421476    [System.Diagnostics.DebuggerStepThroughAttribute()]
    422477    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    423     public partial class ClientFacadeClient : System.ServiceModel.ClientBase<HeuristicLab.Hive.Client.Communication.ServerService.IClientFacade>, HeuristicLab.Hive.Client.Communication.ServerService.IClientFacade {
     478    public partial class ClientFacadeClient : System.ServiceModel.ClientBase<HeuristicLab.Hive.Slave.Communication.ServerService.IClientFacade>, HeuristicLab.Hive.Slave.Communication.ServerService.IClientFacade {
    424479       
    425480        private BeginOperationDelegate onBeginLoginDelegate;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

    r4170 r4253  
    2626using System.ServiceModel;
    2727using HeuristicLab.Hive.Contracts.Interfaces;
    28 using HeuristicLab.Hive.Client.Common;
     28using HeuristicLab.Hive.Slave.Common;
    2929using HeuristicLab.PluginInfrastructure;
    3030using System.IO;
     
    3434using HeuristicLab.Hive.Contracts.BusinessObjects;
    3535
    36 namespace HeuristicLab.Hive.Client.Communication {
    37   using Service = HeuristicLab.Hive.Client.Communication.ServerService;
    38   using HeuristicLab.Hive.Client.Communication.ServerService;
     36namespace HeuristicLab.Hive.Slave.Communication {
     37  using Service = HeuristicLab.Hive.Slave.Communication.ServerService;
     38  using HeuristicLab.Hive.Slave.Communication.ServerService;
    3939
    4040  /// <summary>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj

    r4248 r4253  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Hive.Client.Console</RootNamespace>
    12     <AssemblyName>HeuristicLab.Hive.Client.Console-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Hive.Slave.Console</RootNamespace>
     12    <AssemblyName>HeuristicLab.Hive.Slave.Console-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     
    7878  </PropertyGroup>
    7979  <ItemGroup>
     80    <Reference Include="HeuristicLab.Calendar-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    8081    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    8182      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     
    108109  </ItemGroup>
    109110  <ItemGroup>
    110     <Compile Include="HiveClientConsole.cs">
     111    <Compile Include="HiveSlaveConsole.cs">
    111112      <SubType>Form</SubType>
    112113    </Compile>
    113     <Compile Include="HiveClientConsole.designer.cs">
    114       <DependentUpon>HiveClientConsole.cs</DependentUpon>
    115     </Compile>
    116     <Compile Include="HeuristicLabHiveClientConsolePlugin.cs" />
    117     <Compile Include="HeuristicLabHiveClientConsoleApplication.cs" />
     114    <Compile Include="HiveSlaveConsole.designer.cs">
     115      <DependentUpon>HiveSlaveConsole.cs</DependentUpon>
     116    </Compile>
     117    <Compile Include="HeuristicLabHiveSlaveConsolePlugin.cs" />
     118    <Compile Include="HeuristicLabHiveSlaveConsoleApplication.cs" />
    118119    <Compile Include="LogFileReader.cs" />
    119120    <Compile Include="Properties\AssemblyInfo.cs" />
    120     <EmbeddedResource Include="HiveClientConsole.resx">
    121       <DependentUpon>HiveClientConsole.cs</DependentUpon>
     121    <EmbeddedResource Include="HiveSlaveConsole.resx">
     122      <DependentUpon>HiveSlaveConsole.cs</DependentUpon>
    122123      <SubType>Designer</SubType>
    123124    </EmbeddedResource>
     
    155156      <DependentUpon>Recurrence.cs</DependentUpon>
    156157    </Compile>
    157     <Compile Include="Service References\ClientService\Reference.cs">
     158    <Compile Include="Service References\SlaveService\Reference.cs">
    158159      <AutoGen>True</AutoGen>
    159160      <DesignTime>True</DesignTime>
     
    162163  </ItemGroup>
    163164  <ItemGroup>
    164     <ProjectReference Include="..\..\HeuristicLab.Calendar\3.3\HeuristicLab.Calendar-3.3.csproj">
    165       <Project>{D17A4D6A-4CAA-4470-8A19-F42463C021FD}</Project>
    166       <Name>HeuristicLab.Calendar-3.3</Name>
    167     </ProjectReference>
    168165    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    169166      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     
    176173  <ItemGroup>
    177174    <None Include="Resources\Info.png" />
    178     <None Include="Service References\ClientService\HeuristicLab.Calendar.xsd">
    179       <SubType>Designer</SubType>
    180     </None>
    181     <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Common.xsd" />
    182     <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd" />
    183     <None Include="Service References\ClientService\service.wsdl" />
    184     <None Include="Service References\ClientService\service.xsd" />
    185     <None Include="Service References\ClientService\service1.xsd" />
     175    <None Include="Service References\SlaveService\HeuristicLab.Calendar.xsd">
     176      <SubType>Designer</SubType>
     177    </None>
     178    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Common1.xsd">
     179      <SubType>Designer</SubType>
     180    </None>
     181    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Console.SlaveService.ConnectionContainer.datasource">
     182      <DependentUpon>Reference.svcmap</DependentUpon>
     183    </None>
     184    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Console.SlaveService.StatusCommons.datasource">
     185      <DependentUpon>Reference.svcmap</DependentUpon>
     186    </None>
     187    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Core.ClientConsoleService1.xsd">
     188      <SubType>Designer</SubType>
     189    </None>
     190    <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Core.SlaveConsoleService.xsd" />
     191    <None Include="Service References\SlaveService\service.wsdl" />
     192    <None Include="Service References\SlaveService\service.xsd" />
     193    <None Include="Service References\SlaveService\service1.xsd" />
    186194  </ItemGroup>
    187195  <ItemGroup>
     
    189197  </ItemGroup>
    190198  <ItemGroup>
    191     <WCFMetadataStorage Include="Service References\ClientService\" />
    192   </ItemGroup>
    193   <ItemGroup>
    194     <None Include="Service References\ClientService\configuration91.svcinfo" />
    195   </ItemGroup>
    196   <ItemGroup>
    197     <None Include="Service References\ClientService\configuration.svcinfo" />
    198   </ItemGroup>
    199   <ItemGroup>
    200     <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Console.ClientService.ConnectionContainer.datasource">
    201       <DependentUpon>Reference.svcmap</DependentUpon>
    202     </None>
    203     <None Include="Service References\ClientService\HeuristicLab.Hive.Client.Console.ClientService.StatusCommons.datasource">
    204       <DependentUpon>Reference.svcmap</DependentUpon>
    205     </None>
    206     <None Include="Service References\ClientService\Reference.svcmap">
     199    <WCFMetadataStorage Include="Service References\SlaveService\" />
     200  </ItemGroup>
     201  <ItemGroup>
     202    <None Include="Service References\SlaveService\configuration91.svcinfo" />
     203  </ItemGroup>
     204  <ItemGroup>
     205    <None Include="Service References\SlaveService\configuration.svcinfo" />
     206  </ItemGroup>
     207  <ItemGroup>
     208    <None Include="Service References\SlaveService\Reference.svcmap">
    207209      <Generator>WCF Proxy Generator</Generator>
    208210      <LastGenOutput>Reference.cs</LastGenOutput>
     
    224226  <ItemGroup>
    225227    <None Include="Resources\exit-48.png" />
    226     <None Include="Service References\ClientService\System.Drawing1.xsd" />
     228    <None Include="Service References\SlaveService\System.Drawing1.xsd" />
    227229  </ItemGroup>
    228230  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/LogFileReader.cs

    r2062 r4253  
    2727using System.Diagnostics;
    2828
    29 namespace HeuristicLab.Hive.Client.Console {
     29namespace HeuristicLab.Hive.Slave.Console {
    3030  class LogFileReader {
    3131    string filename = "";
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/AssemblyInfo.frame

    r4077 r4253  
    2828// set of attributes. Change these attribute values to modify the information
    2929// associated with an assembly.
    30 [assembly: AssemblyTitle("HeuristicLab.Hive.Client.Console")]
     30[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.Console")]
    3131[assembly: AssemblyDescription("")]
    3232[assembly: AssemblyConfiguration("")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs

    r4073 r4253  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Client.Console.Properties {
     11namespace HeuristicLab.Hive.Slave.Console.Properties {
    1212    using System;
    1313   
     
    4040            get {
    4141                if (object.ReferenceEquals(resourceMan, null)) {
    42                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Hive.Client.Console.Properties.Resources", typeof(Resources).Assembly);
     42                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Hive.Slave.Console.Properties.Resources", typeof(Resources).Assembly);
    4343                    resourceMan = temp;
    4444                }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Settings.Designer.cs

    r4073 r4253  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Client.Console.Properties {
     11namespace HeuristicLab.Hive.Slave.Console.Properties {
    1212   
    1313   
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Settings.settings

    r953 r4253  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Client.Console.Properties" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Slave.Console.Properties" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Recurrence.Designer.cs

    r1530 r4253  
    1 namespace HeuristicLab.Hive.Client.Console
     1namespace HeuristicLab.Hive.Slave.Console
    22{
    33  partial class Recurrence
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Recurrence.cs

    r2062 r4253  
    2424using System.Windows.Forms;
    2525
    26 namespace HeuristicLab.Hive.Client.Console
     26namespace HeuristicLab.Hive.Slave.Console
    2727{
    2828
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config

    r4107 r4253  
    33    <configSections>
    44        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <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" />
     5            <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" />
    66        </sectionGroup>
    77    </configSections>
    88       <userSettings>
    9         <HeuristicLab.Hive.Client.Console.Properties.Settings>
     9         <HeuristicLab.Hive.Slave.Console.Properties.Settings>
    1010            <setting name="IpAdress" serializeAs="String">
    1111                <value>10.0.0.1</value>
    1212            </setting>
    13         </HeuristicLab.Hive.Client.Console.Properties.Settings>
     13        </HeuristicLab.Hive.Slave.Console.Properties.Settings>
    1414    </userSettings>
    1515       <system.serviceModel>
    1616              <bindings>
    1717                     <netTcpBinding>
    18                             <binding name="NetTcpBinding_IClientConsoleCommunicator" closeTimeout="00:01:00"
     18                            <binding name="NetTcpBinding_ISlaveConsoleCommunicator" closeTimeout="00:01:00"
    1919                                   openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    2020                                   transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"
     
    3535              <client>
    3636                     <endpoint address="net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator"
    37                             binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IClientConsoleCommunicator"
    38                             contract="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator">
     37                            binding="netTcpBinding" bindingConfiguration="NetTcpBinding_ISlaveConsoleCommunicator"
     38                            contract="SlaveService.ISlaveConsoleCommunicator" name="NetTcpBinding_ISlaveConsoleCommunicator">
    3939                            <identity>
    4040                                   <userPrincipalName value="S0920454044@hagenberg.fhooe.at" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/AppointmentContainer.cs

    r4107 r4253  
    55using HeuristicLab.Calendar;
    66
    7 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
     7namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
    88  public class AppointmentContainer {
    99    public DateTime Updated { get; set; }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs

    r4060 r4253  
    2525using System.Text;
    2626using HeuristicLab.Hive.Contracts.BusinessObjects;
    27 using HeuristicLab.Hive.Client.ExecutionEngine;
    28 using HeuristicLab.Hive.Client.Core.ClientConsoleService;
    29 using HeuristicLab.Hive.Client.Communication;
    30 using HeuristicLab.Hive.Client.Core.Properties;
     27using HeuristicLab.Hive.Slave.ExecutionEngine;
     28using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
     29using HeuristicLab.Hive.Slave.Communication;
     30using HeuristicLab.Hive.Slave.Core.Properties;
    3131using HeuristicLab.Hive.Contracts;
    3232
    33 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
     33namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
    3434  /// <summary>
    3535  /// accesses the Server and sends his data (uuid, uptimes, hardware config)
     
    111111      st.FreeCores = hardwareInfo.NrOfCores - GetUsedCores();
    112112
    113       st.JobsAborted = ClientStatusInfo.JobsAborted;
    114       st.JobsDone = ClientStatusInfo.JobsProcessed;
    115       st.JobsFetched = ClientStatusInfo.JobsFetched;     
     113      st.JobsAborted = SlaveStatusInfo.JobsAborted;
     114      st.JobsDone = SlaveStatusInfo.JobsProcessed;
     115      st.JobsFetched = SlaveStatusInfo.JobsFetched;     
    116116
    117117      Dictionary<Guid, Executor> engines = Core.GetExecutionEngines();
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs

    r4107 r4253  
    66using System.Xml.Serialization;
    77using System.IO;
    8 using HeuristicLab.Hive.Client.Common;
     8using HeuristicLab.Hive.Slave.Common;
    99using HeuristicLab.Hive.Contracts.BusinessObjects;
    1010using HeuristicLab.Hive.Contracts;
    1111using HeuristicLab.Tracing;
    1212
    13 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
     13namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
    1414  public class UptimeManager {
    1515
     
    2424    public bool CalendarAvailable { get; set; }
    2525
    26     private static String path = System.IO.Directory.GetCurrentDirectory() + "\\plugins\\Hive.Client.Jobs\\";
     26    private static String path = System.IO.Directory.GetCurrentDirectory() + "\\plugins\\Hive.Slave.Jobs\\";
    2727
    2828    private static UptimeManager instance = null;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

    r4141 r4253  
    2424using System.Linq;
    2525using System.Text;
    26 using HeuristicLab.Hive.Client.ExecutionEngine;
    27 using HeuristicLab.Hive.Client.Common;
     26using HeuristicLab.Hive.Slave.ExecutionEngine;
     27using HeuristicLab.Hive.Slave.Common;
    2828using System.Threading;
    2929using System.Reflection;
     
    3232using System.Security.Policy;
    3333using System.Security;
    34 using HeuristicLab.Hive.Client.Communication;
     34using HeuristicLab.Hive.Slave.Communication;
    3535using HeuristicLab.Hive.Contracts.BusinessObjects;
    3636using HeuristicLab.Hive.Contracts;
     
    3939using System.ServiceModel;
    4040using System.ServiceModel.Description;
    41 using HeuristicLab.Hive.Client.Core.ClientConsoleService;
    42 using HeuristicLab.Hive.Client.Core.ConfigurationManager;
    43 using HeuristicLab.Hive.Client.Communication.ServerService;
     41using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
     42using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
     43using HeuristicLab.Hive.Slave.Communication.ServerService;
    4444using HeuristicLab.Hive.JobBase;
    45 using HeuristicLab.Hive.Client.Core.JobStorage;
     45using HeuristicLab.Hive.Slave.Core.JobStorage;
    4646using HeuristicLab.Tracing;
    4747using HeuristicLab.Core;
    4848using System.IO;
    4949
    50 namespace HeuristicLab.Hive.Client.Core {
     50namespace HeuristicLab.Hive.Slave.Core {
    5151  /// <summary>
    5252  /// The core component of the Hive Client
     
    7979      abortRequested = false;
    8080      Logger.Info("Hive Client started");
    81       ClientConsoleServer server = new ClientConsoleServer();
     81      SlaveConsoleServer server = new SlaveConsoleServer();
    8282      server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/ClientConsole/"));
    8383
     
    335335              engines.Add(e.Result.Job.Id, engine);
    336336
    337               ClientStatusInfo.JobsFetched++;
    338 
    339               Logger.Info("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
     337              SlaveStatusInfo.JobsFetched++;
     338
     339              Logger.Info("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
    340340            }
    341341          }
     
    361361      KillAppDomain(e.Result.JobId);
    362362      if (e.Result.Success) {
    363         ClientStatusInfo.JobsProcessed++;
    364         Logger.Info("Increased ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
     363        SlaveStatusInfo.JobsProcessed++;
     364        Logger.Info("Increased ProcessedJobs to:" + SlaveStatusInfo.JobsProcessed);
    365365      } else {
    366366        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

    r4121 r4253  
    2525using System.Text;
    2626using System.Timers;
    27 using HeuristicLab.Hive.Client.Common;
    28 using HeuristicLab.Hive.Client.Communication;
     27using HeuristicLab.Hive.Slave.Common;
     28using HeuristicLab.Hive.Slave.Communication;
    2929using System.Diagnostics;
    3030using HeuristicLab.Hive.Contracts.BusinessObjects;
    3131using HeuristicLab.Hive.Contracts;
    32 using HeuristicLab.Hive.Client.Core.ConfigurationManager;
    33 using HeuristicLab.Hive.Client.Communication.ServerService;
     32using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
     33using HeuristicLab.Hive.Slave.Communication.ServerService;
    3434using HeuristicLab.Tracing;
    3535//using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
    3636
    37 namespace HeuristicLab.Hive.Client.Core {
     37namespace HeuristicLab.Hive.Slave.Core {
    3838  /// <summary>
    3939  /// Heartbeat class. It sends every x ms a heartbeat to the server and receives a Message
     
    9494
    9595        HeartBeatData heartBeatData = new HeartBeatData {
    96           ClientId = info.Id,
     96          SlaveId = info.Id,
    9797          FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
    9898          FreeMemory = mb,
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageInfo.cs

    r4060 r4253  
    44using System.Text;
    55
    6 namespace HeuristicLab.Hive.Client.Core.JobStorage {
     6namespace HeuristicLab.Hive.Slave.Core.JobStorage {
    77  public class JobStorageInfo {
    88    public String ServerIP { get; set; }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs

    r4060 r4253  
    44using System.Text;
    55using System.IO;
    6 using HeuristicLab.Hive.Client.Common;
    7 using HeuristicLab.Hive.Client.Communication;
    8 using HeuristicLab.Hive.Client.Core.ConfigurationManager;
     6using HeuristicLab.Hive.Slave.Common;
     7using HeuristicLab.Hive.Slave.Communication;
     8using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
    99using HeuristicLab.Hive.Contracts;
    1010using System.Xml.Serialization;
     
    1313using HeuristicLab.Tracing;
    1414
    15 namespace HeuristicLab.Hive.Client.Core.JobStorage {
     15namespace HeuristicLab.Hive.Slave.Core.JobStorage {
    1616  public class JobStorageManager {
    1717   
    1818    private static List<JobStorageInfo> storedJobsList = new List<JobStorageInfo>();
    19    
    20     private static String path = System.IO.Directory.GetCurrentDirectory()+"\\Hive.Client.Jobs\\";
     19
     20    private static String path = System.IO.Directory.GetCurrentDirectory() + "\\Hive.Slave.Jobs\\";
    2121   
    2222    public static void PersistObjectToDisc(String serverIP, long serverPort, Guid jobId, byte[] job) {
     
    5757                Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
    5858            }
    59             ClientStatusInfo.JobsProcessed++;
     59            SlaveStatusInfo.JobsProcessed++;
    6060            storedJobsList.Remove(storedJobsList[index - 1]);
    6161            File.Delete(path + filename + ".dat");
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

    r4141 r4253  
    44using System.Linq;
    55using System.Runtime.CompilerServices;
    6 using HeuristicLab.Hive.Client.Communication;
     6using HeuristicLab.Hive.Slave.Communication;
    77using HeuristicLab.Hive.Contracts.BusinessObjects;
    88using HeuristicLab.PluginInfrastructure;
     
    1010using HeuristicLab.Tracing;
    1111
    12 namespace HeuristicLab.Hive.Client.Core {
     12namespace HeuristicLab.Hive.Slave.Core {
    1313  public class PluginCache {
    1414
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Properties/AssemblyInfo.frame

    r4171 r4253  
    2929// set of attributes. Change these attribute values to modify the information
    3030// associated with an assembly.
    31 [assembly: AssemblyTitle("HeuristicLab.Hive.Client.Core")]
     31[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.Core")]
    3232[assembly: AssemblyDescription("")]
    3333[assembly: AssemblyConfiguration("")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Properties/Settings.Designer.cs

    r4071 r4253  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Client.Core.Properties {
     11namespace HeuristicLab.Hive.Slave.Core.Properties {
    1212   
    1313   
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Properties/Settings.settings

    r4060 r4253  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Client.Core.Properties" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Slave.Core.Properties" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Settings.cs

    r4060 r4253  
    1 namespace HeuristicLab.Hive.Client.Core.Properties {
     1namespace HeuristicLab.Hive.Slave.Core.Properties {
    22   
    33   
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config

    r4060 r4253  
    33    <configSections>
    44        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <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" />
     5            <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" />
    66        </sectionGroup>
    77    </configSections>
    88    <userSettings>
    9         <HeuristicLab.Hive.Client.Core.Properties.Settings>
     9      <HeuristicLab.Hive.Slave.Core.Properties.Settings>
    1010            <setting name="Guid" serializeAs="String">
    1111                <value>00000000-0000-0000-0000-000000000000</value>
     
    1717                <value>0</value>
    1818            </setting>
    19         </HeuristicLab.Hive.Client.Core.Properties.Settings>
     19        </HeuristicLab.Hive.Slave.Core.Properties.Settings>
    2020    </userSettings>
    2121</configuration>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs

    r4170 r4253  
    2121
    2222using System;
    23 using HeuristicLab.Hive.Client.Common;
     23using HeuristicLab.Hive.Slave.Common;
    2424using HeuristicLab.Hive.Contracts;
    2525using HeuristicLab.Hive.JobBase;
     
    3131using HeuristicLab.Core;
    3232
    33 namespace HeuristicLab.Hive.Client.ExecutionEngine {
     33namespace HeuristicLab.Hive.Slave.ExecutionEngine {
    3434  public class Executor : MarshalByRefObject, IDisposable {
    3535    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

    r4248 r4253  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Hive.Client.ExecutionEngine</RootNamespace>
    12     <AssemblyName>HeuristicLab.Hive.Client.ExecutionEngine-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Hive.Slave.ExecutionEngine</RootNamespace>
     12    <AssemblyName>HeuristicLab.Hive.Slave.ExecutionEngine-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     
    101101  <ItemGroup>
    102102    <Compile Include="Executor.cs" />
    103     <Compile Include="HeuristicLabHiveClientExecutionEnginePlugin.cs" />
     103    <Compile Include="HeuristicLabHiveSlaveExecutionEnginePlugin.cs" />
    104104    <Compile Include="InvalidStateException.cs" />
    105105    <Compile Include="Properties\AssemblyInfo.cs" />
     
    110110  </ItemGroup>
    111111  <ItemGroup>
    112     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
    113       <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
    114       <Name>HeuristicLab.Hive.Client.Common-3.3</Name>
    115     </ProjectReference>
    116112    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    117113      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     
    121117      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
    122118      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     119    </ProjectReference>
     120    <ProjectReference Include="..\..\HeuristicLab.Hive.Slave.Common\3.3\HeuristicLab.Hive.Slave.Common-3.3.csproj">
     121      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
     122      <Name>HeuristicLab.Hive.Slave.Common-3.3</Name>
    123123    </ProjectReference>
    124124  </ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/InvalidStateException.cs

    r1530 r4253  
    44using System.Text;
    55
    6 namespace HeuristicLab.Hive.Client.ExecutionEngine {
     6namespace HeuristicLab.Hive.Slave.ExecutionEngine {
    77  [global::System.Serializable]
    88  public class InvalidStateException : Exception {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Properties/AssemblyInfo.frame

    r4171 r4253  
    2929// set of attributes. Change these attribute values to modify the information
    3030// associated with an assembly.
    31 [assembly: AssemblyTitle("HeuristicLab.Hive.Client.ExecutionEngine")]
     31[assembly: AssemblyTitle("HeuristicLab.Hive.Slave.ExecutionEngine")]
    3232[assembly: AssemblyDescription("")]
    3333[assembly: AssemblyConfiguration("")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.log4net.xml

    r4136 r4253  
    2727
    2828  <appender name="ClientRollingFileAppender" type="log4net.Appender.RollingFileAppender">
    29     <file value="Hive.Client.log" />
     29    <file value="Hive.Slave.log" />
    3030    <appendToFile value="true" />
    3131    <rollingStyle value="Size" />
     
    8585  </logger>
    8686
    87   <logger name="HeuristicLab.Hive.Client">
     87  <logger name="HeuristicLab.Hive.Slave">
    8888    <level value="DEBUG" />
    8989    <appender-ref ref="ClientBufferingForwardingAppender" /> 
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

    r4136 r4253  
    77HeuristicLab.DataAccess.ADOHelper\3.3:HeuristicLab.DataAccess.ADOHelper-3.3.dll
    88
    9 
    10 
    11 HeuristicLab.Hive.Client.Common\3.3:HeuristicLab.Hive.Client.Common-3.3.dll
    12 HeuristicLab.Hive.Client.Communication\3.3:HeuristicLab.Hive.Client.Communication-3.3.dll
    13 ; HeuristicLab.Hive.Client.Console\3.3:Calendar.DayView.dll
    14 HeuristicLab.Hive.Client.Console\3.3:HeuristicLab.Hive.Client.Console-3.3.dll
    15 HeuristicLab.Hive.Client.Console\3.3:ZedGraph.dll
    16 HeuristicLab.Hive.Client.Core\3.3:HeuristicLab.Hive.Client.Core-3.3.dll
    17 HeuristicLab.Hive.Client.ExecutionEngine\3.3:HeuristicLab.Hive.Client.ExecutionEngine-3.3.dll
     9HeuristicLab.Hive.Slave.Common\3.3:HeuristicLab.Hive.Slave.Common-3.3.dll
     10HeuristicLab.Hive.Slave.Communication\3.3:HeuristicLab.Hive.Slave.Communication-3.3.dll
     11HeuristicLab.Hive.Slave.Console\3.3:HeuristicLab.Hive.Slave.Console-3.3.dll
     12HeuristicLab.Hive.Slave.Console\3.3:ZedGraph.dll
     13HeuristicLab.Hive.Slave.Core\3.3:HeuristicLab.Hive.Slave.Core-3.3.dll
     14HeuristicLab.Hive.Slave.ExecutionEngine\3.3:HeuristicLab.Hive.Slave.ExecutionEngine-3.3.dll
    1815
    1916HeuristicLab.Hive.Engine\3.3:HeuristicLab.Hive.Engine-3.3.dll
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

    r4170 r4253  
    11ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.LINQDataAccess\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    2 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Client.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
     2ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    33ConfigMerger "%SolutionDir%HeuristicLab.Hive.Experiment\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    44ConfigMerger "%SolutionDir%HeuristicLab.Hive.Tracing\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
Note: See TracChangeset for help on using the changeset viewer.