Changeset 6698


Ignore:
Timestamp:
09/02/11 11:49:53 (8 years ago)
Author:
ascheibe
Message:

#1233

  • implemented review comments
  • more cleanups
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
12 added
14 deleted
14 edited
1 moved

Legend:

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

    r6696 r6698  
    5353  EndProjectSection
    5454EndProject
    55 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.4.Tests", "HeuristicLab.Services.Hive.Tests\HeuristicLab.Services.Hive-3.4.Tests.csproj", "{17187EAC-5D8C-4B11-9CEA-D88F71B59658}"
     55Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.Tests-3.4", "HeuristicLab.Services.Hive.Tests\HeuristicLab.Services.Hive.Tests-3.4.csproj", "{17187EAC-5D8C-4B11-9CEA-D88F71B59658}"
    5656EndProject
    5757Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.SlaveWindowsService", "HeuristicLab.Clients.Hive.Slave.SlaveWindowsService\HeuristicLab.Clients.Hive.Slave.SlaveWindowsService.csproj", "{BA8001DE-E83C-4B1F-8B2E-2695C4222491}"
     
    5959Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup", "HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup\HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup.vdproj", "{28711372-0255-4883-9BED-81E150D73880}"
    6060EndProject
    61 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon", "HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon\HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon.csproj", "{7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}"
    62 EndProject
    6361Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Tests-3.4", "HeuristicLab.Clients.Hive.Tests\HeuristicLab.Clients.Hive.Tests-3.4.csproj", "{8D40A723-139D-40E4-8BBA-4CB309A9E4B9}"
    6462EndProject
     
    8179Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine-3.4", "HeuristicLab.HiveEngine\3.4\HeuristicLab.HiveEngine-3.4.csproj", "{2C036542-5451-4A23-AFF6-87575C7BAFE7}"
    8280EndProject
    83 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.TrayIconSetup", "HeuristicLab.Clients.Hive.Slave.TrayIconSetup\HeuristicLab.Clients.Hive.Slave.TrayIconSetup.vdproj", "{542AD827-817C-44E9-AD28-D6607BC4FA10}"
    84 EndProject
    8581Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine.Views-3.4", "HeuristicLab.HiveEngine.Views\3.4\HeuristicLab.HiveEngine.Views-3.4.csproj", "{E37F15E0-D0D6-4C6E-AD22-0DA514C943A3}"
    8682EndProject
    87 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.4.ConsoleTests", "HeuristicLab.Clients.Hive.Slave\3.4\ConsoleTests\HeuristicLab.Clients.Hive.Slave-3.4.ConsoleTests.csproj", "{B09E8C65-8D4D-48B3-8E9A-F6FC52107261}"
    88 EndProject
    8983Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4", "HeuristicLab.Clients.Hive.Slave.ConsoleClient\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj", "{464D70B8-2D91-485C-B622-22E4A4891C68}"
    9084EndProject
     
    9690EndProject
    9791Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.DbCreator-3.3", "HeuristicLab.Services.Hive.DbCreator\3.3\HeuristicLab.Services.Hive.DbCreator-3.3.csproj", "{691FC65E-CA1A-4477-B66F-EB49D21B7393}"
     92EndProject
     93Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3", "HeuristicLab.Clients.Hive.Slave.TrayIcon\3.3\HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj", "{7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}"
     94EndProject
     95Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.TrayIconSetup", "HeuristicLab.Clients.Hive.Slave.TrayIconSetup\HeuristicLab.Clients.Hive.Slave.TrayIconSetup.vdproj", "{E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}"
    9896EndProject
    9997Global
     
    269267    {28711372-0255-4883-9BED-81E150D73880}.Release|x64.Build.0 = Release
    270268    {28711372-0255-4883-9BED-81E150D73880}.Release|x86.ActiveCfg = Release
    271     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    272     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
    273     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    274     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    275     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x64.ActiveCfg = Debug|x86
    276     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.ActiveCfg = Debug|x86
    277     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.Build.0 = Debug|x86
    278     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    279     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.Build.0 = Release|Any CPU
    280     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Mixed Platforms.ActiveCfg = Release|x86
    281     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Mixed Platforms.Build.0 = Release|x86
    282     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x64.ActiveCfg = Release|x86
    283     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.ActiveCfg = Release|x86
    284     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.Build.0 = Release|x86
    285269    {8D40A723-139D-40E4-8BBA-4CB309A9E4B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    286270    {8D40A723-139D-40E4-8BBA-4CB309A9E4B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    327311    {2C036542-5451-4A23-AFF6-87575C7BAFE7}.Release|x86.ActiveCfg = Release|x86
    328312    {2C036542-5451-4A23-AFF6-87575C7BAFE7}.Release|x86.Build.0 = Release|x86
    329     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|Any CPU.ActiveCfg = Debug
    330     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|Any CPU.Build.0 = Debug
    331     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|Mixed Platforms.ActiveCfg = Debug
    332     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|Mixed Platforms.Build.0 = Debug
    333     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|x64.ActiveCfg = Debug
    334     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|x64.Build.0 = Debug
    335     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|x86.ActiveCfg = Debug
    336     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Debug|x86.Build.0 = Debug
    337     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|Any CPU.ActiveCfg = Release
    338     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|Any CPU.Build.0 = Release
    339     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|Mixed Platforms.ActiveCfg = Release
    340     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|Mixed Platforms.Build.0 = Release
    341     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|x64.ActiveCfg = Release
    342     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|x64.Build.0 = Release
    343     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|x86.ActiveCfg = Release
    344     {542AD827-817C-44E9-AD28-D6607BC4FA10}.Release|x86.Build.0 = Release
    345313    {E37F15E0-D0D6-4C6E-AD22-0DA514C943A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    346314    {E37F15E0-D0D6-4C6E-AD22-0DA514C943A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    359327    {E37F15E0-D0D6-4C6E-AD22-0DA514C943A3}.Release|x86.ActiveCfg = Release|x86
    360328    {E37F15E0-D0D6-4C6E-AD22-0DA514C943A3}.Release|x86.Build.0 = Release|x86
    361     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    362     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|Any CPU.Build.0 = Debug|Any CPU
    363     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    364     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    365     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|x64.ActiveCfg = Debug|x86
    366     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|x86.ActiveCfg = Debug|x86
    367     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Debug|x86.Build.0 = Debug|x86
    368     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|Any CPU.ActiveCfg = Release|Any CPU
    369     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|Any CPU.Build.0 = Release|Any CPU
    370     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    371     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    372     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|x64.ActiveCfg = Release|x86
    373     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|x86.ActiveCfg = Release|x86
    374     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|x86.Build.0 = Release|x86
    375329    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    376330    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    446400    {691FC65E-CA1A-4477-B66F-EB49D21B7393}.Release|x86.ActiveCfg = Release|x86
    447401    {691FC65E-CA1A-4477-B66F-EB49D21B7393}.Release|x86.Build.0 = Release|x86
     402    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     403    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     404    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     405    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     406    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x64.ActiveCfg = Debug|x86
     407    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.ActiveCfg = Debug|x86
     408    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.Build.0 = Debug|x86
     409    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
     410    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.Build.0 = Release|Any CPU
     411    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     412    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     413    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x64.ActiveCfg = Release|x86
     414    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.ActiveCfg = Release|x86
     415    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.Build.0 = Release|x86
     416    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|Any CPU.ActiveCfg = Debug
     417    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|Any CPU.Build.0 = Debug
     418    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|Mixed Platforms.ActiveCfg = Debug
     419    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|Mixed Platforms.Build.0 = Debug
     420    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|x64.ActiveCfg = Debug
     421    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|x64.Build.0 = Debug
     422    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|x86.ActiveCfg = Debug
     423    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Debug|x86.Build.0 = Debug
     424    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|Any CPU.ActiveCfg = Release
     425    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|Any CPU.Build.0 = Release
     426    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|Mixed Platforms.ActiveCfg = Release
     427    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|Mixed Platforms.Build.0 = Release
     428    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|x64.ActiveCfg = Release
     429    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|x64.Build.0 = Release
     430    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|x86.ActiveCfg = Release
     431    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6}.Release|x86.Build.0 = Release
    448432  EndGlobalSection
    449433  GlobalSection(SolutionProperties) = preSolution
     
    455439    {BA8001DE-E83C-4B1F-8B2E-2695C4222491} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    456440    {28711372-0255-4883-9BED-81E150D73880} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     441    {989FE92B-484E-41EE-87E2-6A24AF0381D8} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     442    {464D70B8-2D91-485C-B622-22E4A4891C68} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    457443    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    458     {989FE92B-484E-41EE-87E2-6A24AF0381D8} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    459     {542AD827-817C-44E9-AD28-D6607BC4FA10} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    460     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    461     {464D70B8-2D91-485C-B622-22E4A4891C68} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     444    {E2171917-7CD6-4C03-BA98-7DF4B5FA42D6} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    462445    {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC} = {E69A1E5F-63F7-493F-BBA2-163D6E321D44}
    463446    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE} = {E69A1E5F-63F7-493F-BBA2-163D6E321D44}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

    r6479 r6698  
    197197
    198198    [OperationContract]
    199     void TriggerLifecycle(bool force);
     199    void TriggerEventManager(bool force);
    200200    #endregion
    201201
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml

    r6452 r6698  
    11<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.Hive" Class="HiveDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
    2   <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
     2  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Hive.DataAccess.Settings" SettingsPropertyName="HeuristicLab_Hive_LinqConnectionString" Provider="System.Data.SqlClient" />
    33  <Table Name="dbo.AssignedResources" Member="AssignedResources">
    44    <Type Name="AssignedResource">
    5       <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
    6       <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
    7       <Column Name="AssignedRessourcesId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
     5      <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
     6      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
    87      <Association Name="Resource_AssignedResource" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" />
    98      <Association Name="Job_AssignedResource" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" DeleteRule="CASCADE" />
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout

    r6452 r6698  
    33  <DataContextMoniker Name="/HiveDataContext" />
    44  <nestedChildShapes>
    5     <classShape Id="a929c9dc-69f4-4488-ba1c-a2342bf81d89" absoluteBounds="8.875, 4, 2, 1.3862939453124987">
     5    <classShape Id="a929c9dc-69f4-4488-ba1c-a2342bf81d89" absoluteBounds="8.875, 4, 2, 1.1939925130208327">
    66      <DataClassMoniker Name="/HiveDataContext/AssignedResource" />
    77      <nestedChildShapes>
    8         <elementListCompartment Id="8b005775-f0ee-41b0-ae10-6d1151003708" absoluteBounds="8.89, 4.4600000000000009, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
     8        <elementListCompartment Id="8b005775-f0ee-41b0-ae10-6d1151003708" absoluteBounds="8.89, 4.4600000000000009, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
    99      </nestedChildShapes>
    1010    </classShape>
     
    6969      </nodes>
    7070    </inheritanceConnector>
    71     <associationConnector edgePoints="[(12.25 : 2.57859537760417); (12.25 : 4.69314697265625); (10.875 : 4.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     71    <associationConnector edgePoints="[(11.9843735 : 2.57859537760417); (11.9843735 : 4.59699625651042); (10.875 : 4.59699625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    7272      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_AssignedResource" />
    7373      <nodes>
     
    7676      </nodes>
    7777    </associationConnector>
    78     <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.84780160677083); (8.875 : 4.84780160677083)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     78    <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.751650890625); (8.875 : 4.751650890625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    7979      <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
    8080      <nodes>
     
    221221      </nodes>
    222222    </associationConnector>
    223     <associationConnector edgePoints="[(12.781252 : 2.57859537760417); (12.781252 : 3.64829952604167); (13.5 : 3.64829952604167)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     223    <associationConnector edgePoints="[(12.781252 : 2.57859537760417); (12.781252 : 3.64829952604167); (13.5 : 3.64829952604167)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    224224      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_Downtime" />
    225225      <nodes>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs

    r6452 r6698  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:4.0.30319.225
     5//     Runtime Version:4.0.30319.235
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
     
    1212namespace HeuristicLab.Services.Hive.DataAccess
    1313{
    14   using System;
    15   using System.ComponentModel;
    16   using System.Data.Linq;
    17   using System.Data.Linq.Mapping;
     14  using System.Data.Linq;
     15  using System.Data.Linq.Mapping;
     16  using System.Data;
     17  using System.Collections.Generic;
     18  using System.Reflection;
     19  using System.Linq;
     20  using System.Linq.Expressions;
     21  using System.ComponentModel;
     22  using System;
    1823 
    1924 
     
    245250    private System.Guid _JobId;
    246251   
    247     private System.Guid _AssignedRessourcesId;
    248    
    249252    private EntityRef<Resource> _Resource;
    250253   
     
    259262    partial void OnJobIdChanging(System.Guid value);
    260263    partial void OnJobIdChanged();
    261     partial void OnAssignedRessourcesIdChanging(System.Guid value);
    262     partial void OnAssignedRessourcesIdChanged();
    263264    #endregion
    264265   
     
    270271    }
    271272   
    272     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceId", DbType="UniqueIdentifier NOT NULL")]
     273    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
    273274    public System.Guid ResourceId
    274275    {
     
    294295    }
    295296   
    296     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL")]
     297    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
    297298    public System.Guid JobId
    298299    {
     
    314315          this.SendPropertyChanged("JobId");
    315316          this.OnJobIdChanged();
    316         }
    317       }
    318     }
    319    
    320     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AssignedRessourcesId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
    321     public System.Guid AssignedRessourcesId
    322     {
    323       get
    324       {
    325         return this._AssignedRessourcesId;
    326       }
    327       set
    328       {
    329         if ((this._AssignedRessourcesId != value))
    330         {
    331           this.OnAssignedRessourcesIdChanging(value);
    332           this.SendPropertyChanging();
    333           this._AssignedRessourcesId = value;
    334           this.SendPropertyChanged("AssignedRessourcesId");
    335           this.OnAssignedRessourcesIdChanged();
    336317        }
    337318      }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/SQL Scripts/Initialize Hive Database.sql

    r6688 r6698  
    55CREATE TABLE [dbo].[AssignedResources](
    66  [ResourceId] UniqueIdentifier NOT NULL,
    7   [JobId] UniqueIdentifier NOT NULL,
    8   [AssignedRessourcesId] UniqueIdentifier NOT NULL,
    9   CONSTRAINT [PK_dbo.AssignedResources] PRIMARY KEY ([AssignedRessourcesId])
     7  [JobId] UniqueIdentifier NOT NULL,  
     8  CONSTRAINT [PK_dbo.ResourceId] PRIMARY KEY ([ResourceId]),
     9  CONSTRAINT [PK_dbo.JobId] PRIMARY KEY ([JobId])
    1010  )
    1111CREATE TABLE [dbo].[Plugin](
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/SQL Scripts/Prepare Hive Database.sql

    r6688 r6698  
    88
    99
    10 ALTER TABLE dbo.AssignedResources ALTER COLUMN AssignedRessourcesId ADD ROWGUIDCOL;
    11 ALTER TABLE dbo.AssignedResources WITH NOCHECK ADD CONSTRAINT [DF_AssignedResources_AssignedRessourcesId] DEFAULT (NEWSEQUENTIALID()) FOR AssignedRessourcesId;
    1210ALTER TABLE [dbo].[AssignedResources]  DROP  CONSTRAINT [Job_AssignedResource]
    1311ALTER TABLE [dbo].[AssignedResources]  WITH CHECK ADD  CONSTRAINT [Job_AssignedResource] FOREIGN KEY([JobId])
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs

    r6452 r6698  
    2121
    2222namespace HeuristicLab.Services.Hive.Tests.Mocks {
    23   public class MockLifecycleManager : ILifecycleManager {
     23  public class MockLifecycleManager : IEventManager {
    2424    public void Cleanup() { }
    2525  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs

    r6463 r6698  
    4545    }
    4646
    47     public ILifecycleManager LifecycleManager {
    48       get { return defaultServiceLocator.LifecycleManager; }
     47    public IEventManager EventManager {
     48      get { return defaultServiceLocator.EventManager; }
    4949    }
    5050    public ITransactionManager TransactionManager {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

    r6463 r6698  
    276276
    277277      // lifecycle - let it process one server-heartbeat; the parent job must NOT be set to finished
    278       service.TriggerLifecycle(true);
     278      service.TriggerEventManager(true);
    279279
    280280      parentJobLoaded = service.GetJob(parentJob.Id);
     
    285285
    286286      // lifecycle - let it process one server-heartbeat; this should set the parent job to finished
    287       service.TriggerLifecycle(true);
     287      service.TriggerEventManager(true);
    288288
    289289      // test if parent job is finished
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj

    r6463 r6698  
    110110    <Compile Include="Manager\HeartbeatManager.cs" />
    111111    <Compile Include="Interfaces\IAuthenticationManager.cs" />
    112     <Compile Include="Interfaces\ILifecycleManager.cs" />
     112    <Compile Include="Interfaces\IEventManager.cs" />
    113113    <Compile Include="Interfaces\IServiceLocator.cs" />
    114114    <Compile Include="Manager\AuthorizationManager.cs" />
    115115    <Compile Include="HeuristicLabServicesHivePlugin.cs" />
    116     <Compile Include="Manager\LifecycleManager.cs" />
     116    <Compile Include="Manager\EventManager.cs" />
    117117    <Compile Include="HiveRoles.cs" />
    118118    <Compile Include="HiveService.cs" />
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

    r6479 r6698  
    4848      get { return ServiceLocator.Instance.TransactionManager; }
    4949    }
    50     private ILifecycleManager lifecycleManager {
    51       get { return ServiceLocator.Instance.LifecycleManager; }
     50    private IEventManager eventManager {
     51      get { return ServiceLocator.Instance.EventManager; }
    5252    }
    5353    private IUserManager userManager {
     
    382382    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
    383383      authen.AuthenticateForAnyRole(HiveRoles.Slave);
    384       TriggerLifecycle(false);
     384      TriggerEventManager(false);
    385385      return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
    386386    }
     
    532532    }
    533533
    534     public void TriggerLifecycle(bool force) {
     534    public void TriggerEventManager(bool force) {
    535535      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Slave);
    536536      // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
     
    539539        if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
    540540          dao.SetLastCleanup(DateTime.Now);
    541           lifecycleManager.Cleanup();
     541          eventManager.Cleanup();
    542542        }
    543543      }, true);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IServiceLocator.cs

    r6463 r6698  
    2727    IAuthorizationManager AuthorizationManager { get; }
    2828    IHiveDao HiveDao { get; }
    29     ILifecycleManager LifecycleManager { get; }
     29    IEventManager EventManager { get; }
    3030    ITransactionManager TransactionManager { get; }
    3131    IUserManager UserManager { get; }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs

    r6463 r6698  
    5858    }
    5959
    60     private ILifecycleManager lifecycleManager;
    61     public ILifecycleManager LifecycleManager {
     60    private IEventManager eventManager;
     61    public IEventManager EventManager {
    6262      get {
    63         if (lifecycleManager == null) lifecycleManager = new LifecycleManager();
    64         return lifecycleManager;
     63        if (eventManager == null) eventManager = new EventManager();
     64        return eventManager;
    6565      }
    6666    }
Note: See TracChangeset for help on using the changeset viewer.