Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4091


Ignore:
Timestamp:
07/23/10 09:37:57 (13 years ago)
Author:
cneumuel
Message:

resolved issues with 3.3, hive-server now executable (1096)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
7 added
3 deleted
40 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess.ADOHelper/3.3/DataAccessADOHelperPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.DataAccess.ADOHelper {
    28   [Plugin("HeuristicLab.DataAccess.ADOHelper-3.3")]
     28  [Plugin("HeuristicLab.DataAccess.ADOHelper", "3.3")]
    2929  [PluginFile("HeuristicLab.DataAccess.ADOHelper-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  public class DataAccessADOHelperPlugin : PluginBase {
    3232  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess/3.3/DataAccessPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.DataAccess {
    28   [Plugin("HeuristicLab.DataAccess-3.3")]
     28  [Plugin("HeuristicLab.DataAccess", "3.3")]
    2929  [PluginFile("HeuristicLab.DataAccess-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  public class DataAccessPlugin : PluginBase {
    3232  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0/HeuristicLab.SpringNET-1.3.0.csproj

    r4053 r4091  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    1515    <SignAssembly>true</SignAssembly>
    1616    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     17    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
     21    <PublishUrl>publish\</PublishUrl>
     22    <Install>true</Install>
     23    <InstallFrom>Disk</InstallFrom>
     24    <UpdateEnabled>false</UpdateEnabled>
     25    <UpdateMode>Foreground</UpdateMode>
     26    <UpdateInterval>7</UpdateInterval>
     27    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     28    <UpdatePeriodically>false</UpdatePeriodically>
     29    <UpdateRequired>false</UpdateRequired>
     30    <MapFileExtensions>true</MapFileExtensions>
     31    <ApplicationRevision>0</ApplicationRevision>
     32    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     33    <IsWebBootstrapper>false</IsWebBootstrapper>
     34    <UseApplicationTrust>false</UseApplicationTrust>
     35    <BootstrapperEnabled>true</BootstrapperEnabled>
    1736  </PropertyGroup>
    1837  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2544    <WarningLevel>4</WarningLevel>
    2645    <PlatformTarget>AnyCPU</PlatformTarget>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2747  </PropertyGroup>
    2848  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3353    <ErrorReport>prompt</ErrorReport>
    3454    <WarningLevel>4</WarningLevel>
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3556  </PropertyGroup>
    3657  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    4162    <PlatformTarget>x64</PlatformTarget>
    4263    <ErrorReport>prompt</ErrorReport>
     64    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4365  </PropertyGroup>
    4466  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    4971    <PlatformTarget>x64</PlatformTarget>
    5072    <ErrorReport>prompt</ErrorReport>
     73    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5174  </PropertyGroup>
    5275  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    5780    <PlatformTarget>x86</PlatformTarget>
    5881    <ErrorReport>prompt</ErrorReport>
     82    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5983  </PropertyGroup>
    6084  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    6589    <PlatformTarget>x86</PlatformTarget>
    6690    <ErrorReport>prompt</ErrorReport>
     91    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6792  </PropertyGroup>
    6893  <ItemGroup>
     94    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     95      <HintPath>..\..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     96    </Reference>
    6997    <Reference Include="System" />
    7098    <Reference Include="System.Core">
     
    107135  </ItemGroup>
    108136  <ItemGroup>
    109     <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    110       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    111       <Name>HeuristicLab.PluginInfrastructure</Name>
    112     </ProjectReference>
     137    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     138      <Visible>False</Visible>
     139      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     140      <Install>false</Install>
     141    </BootstrapperPackage>
     142    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     143      <Visible>False</Visible>
     144      <ProductName>.NET Framework 3.5 SP1</ProductName>
     145      <Install>true</Install>
     146    </BootstrapperPackage>
     147    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     148      <Visible>False</Visible>
     149      <ProductName>Windows Installer 3.1</ProductName>
     150      <Install>true</Install>
     151    </BootstrapperPackage>
    113152  </ItemGroup>
    114153  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4078 r4091  
    77EndProject
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive-3.3", "HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj", "{C92AAC8C-4D88-449C-ABA5-2B935D769842}"
     9  ProjectSection(ProjectDependencies) = postProject
     10    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84} = {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}
     11    {21187322-52DD-4243-80A4-A85F0263E63B} = {21187322-52DD-4243-80A4-A85F0263E63B}
     12    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F} = {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}
     13    {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {D59E852C-F205-4647-8C05-EB9ED1CF44E9}
     14    {CE2DFB48-6A9C-4507-96C6-5FC40E92035C} = {CE2DFB48-6A9C-4507-96C6-5FC40E92035C}
     15    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B} = {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}
     16    {679E977A-117B-456E-8594-2A4DEADB658B} = {679E977A-117B-456E-8594-2A4DEADB658B}
     17    {9076697B-C151-46CD-95BC-1D059492B478} = {9076697B-C151-46CD-95BC-1D059492B478}
     18    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1} = {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}
     19    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} = {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}
     20    {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {898B31CF-81DC-453B-AEB3-BDF83197A7EE}
     21    {134F93D7-E7C8-4ECD-9923-7F63259A60D8} = {134F93D7-E7C8-4ECD-9923-7F63259A60D8}
     22    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0} = {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}
     23    {AC3D84FF-F0D7-43F0-9C99-9F8DBE087E2C} = {AC3D84FF-F0D7-43F0-9C99-9F8DBE087E2C}
     24  EndProjectSection
    925EndProject
    1026Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02A1B491-BFBA-407C-BE63-0227871E7B5C}"
     
    5268Project("{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}"
    5369EndProject
    54 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}"
    55 EndProject
    56 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}"
    57 EndProject
    58 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "Security", "{3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}"
     70Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive.Client", "HeuristicLab.Hive.Client", "{DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}"
     71EndProject
     72Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive.Server", "HeuristicLab.Hive.Server", "{E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}"
     73EndProject
     74Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Security", "HeuristicLab.Security", "{3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}"
     75EndProject
     76Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive", "HeuristicLab.Hive", "{84899895-AC52-4053-8A91-61753EF8E0A8}"
     77EndProject
     78Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab", "HeuristicLab", "{BD1DE6F6-A188-4D1F-9681-BA7104818370}"
     79EndProject
     80Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.ExtLibs", "HeuristicLab.ExtLibs", "{98B4B360-4F14-4BC5-92F2-9B81F6C712DA}"
     81EndProject
     82Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SpringNET-1.3.0", "HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\HeuristicLab.SpringNET-1.3.0.csproj", "{48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}"
    5983EndProject
    6084Global
     
    316340    {21187322-52DD-4243-80A4-A85F0263E63B}.Release|x86.ActiveCfg = Release|x86
    317341    {21187322-52DD-4243-80A4-A85F0263E63B}.Release|x86.Build.0 = Release|x86
     342    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     343    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
     344    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x64.ActiveCfg = Debug|x64
     345    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x64.Build.0 = Debug|x64
     346    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x86.ActiveCfg = Debug|x86
     347    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x86.Build.0 = Debug|x86
     348    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
     349    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|Any CPU.Build.0 = Release|Any CPU
     350    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x64.ActiveCfg = Release|x64
     351    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x64.Build.0 = Release|x64
     352    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x86.ActiveCfg = Release|x86
     353    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x86.Build.0 = Release|x86
    318354  EndGlobalSection
    319355  GlobalSection(SolutionProperties) = preSolution
     
    321357  EndGlobalSection
    322358  GlobalSection(NestedProjects) = preSolution
    323     {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    324     {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    325359    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    326360    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     361    {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     362    {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    327363    {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    328     {679E977A-117B-456E-8594-2A4DEADB658B} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    329364    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    330365    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    331     {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    332366    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    333367    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
    334     {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
    335     {E3288D4B-7A51-499A-AC5B-019319CE51DC} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
     368    {679E977A-117B-456E-8594-2A4DEADB658B} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     369    {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     370    {134F93D7-E7C8-4ECD-9923-7F63259A60D8} = {84899895-AC52-4053-8A91-61753EF8E0A8}
     371    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} = {84899895-AC52-4053-8A91-61753EF8E0A8}
     372    {21187322-52DD-4243-80A4-A85F0263E63B} = {84899895-AC52-4053-8A91-61753EF8E0A8}
     373    {C92AAC8C-4D88-449C-ABA5-2B935D769842} = {84899895-AC52-4053-8A91-61753EF8E0A8}
    336374    {CE2DFB48-6A9C-4507-96C6-5FC40E92035C} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
    337375    {AC3D84FF-F0D7-43F0-9C99-9F8DBE087E2C} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
     376    {E3288D4B-7A51-499A-AC5B-019319CE51DC} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
     377    {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
     378    {9076697B-C151-46CD-95BC-1D059492B478} = {BD1DE6F6-A188-4D1F-9681-BA7104818370}
     379    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B} = {BD1DE6F6-A188-4D1F-9681-BA7104818370}
     380    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1} = {98B4B360-4F14-4BC5-92F2-9B81F6C712DA}
    338381  EndGlobalSection
    339382EndGlobal
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Communication/3.3/HeuristicLab.Hive.Client.Communication-3.3.csproj

    r4078 r4091  
    7676  </PropertyGroup>
    7777  <ItemGroup>
     78    <Reference Include="HeuristicLab.Core-3.3">
     79      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     80    </Reference>
    7881    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    7982      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Communication/3.3/WcfService.cs

    r3931 r4091  
    2626using System.ServiceModel;
    2727using HeuristicLab.Hive.Contracts.Interfaces;
    28 using HeuristicLab.Hive.Contracts;
    29 using HeuristicLab.Hive.Contracts.BusinessObjects;
    3028using HeuristicLab.Hive.Client.Common;
    31 using HeuristicLab.Hive.Client.Communication.ServerService;
    3229using HeuristicLab.PluginInfrastructure;
    3330using System.IO;
    3431using System.Runtime.Serialization.Formatters.Binary;
    3532using HeuristicLab.Tracing;
     33using HeuristicLab.Hive.Contracts;
     34using HeuristicLab.Hive.Contracts.BusinessObjects;
    3635
    3736namespace HeuristicLab.Hive.Client.Communication {
     37  using Service = HeuristicLab.Hive.Client.Communication.ServerService;
     38
    3839  /// <summary>
    3940  /// WcfService class is implemented as a Singleton and works as a communication Layer with the Server
     
    6465    public event EventHandler Connected;   
    6566
    66     public ClientFacadeClient proxy = null;
     67    public Service.ClientFacadeClient proxy = null;
    6768
    6869    /// <summary>
     
    8586
    8687        Logger.Debug("Creating the new connection proxy");
    87         proxy = new ClientFacadeClient(
    88           WcfSettings.GetStreamedBinding(),
     88        proxy = new HeuristicLab.Hive.Client.Communication.ServerService.ClientFacadeClient(
     89          HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
    8990          new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator")
    9091        );
     
    9293
    9394        Logger.Debug("Registring new Events");
    94         proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
    95         proxy.SendStreamedJobCompleted += new EventHandler<SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
    96         proxy.StoreFinishedJobResultStreamedCompleted += new EventHandler<StoreFinishedJobResultStreamedCompletedEventArgs>(proxy_StoreFinishedJobResultStreamedCompleted);
    97         proxy.ProcessSnapshotStreamedCompleted += new EventHandler<ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
    98         proxy.ProcessHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(proxy_ProcessHeartBeatCompleted);
     95        proxy.LoginCompleted += new EventHandler<Service.LoginCompletedEventArgs>(proxy_LoginCompleted);
     96        proxy.SendStreamedJobCompleted += new EventHandler<Service.SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
     97        proxy.StoreFinishedJobResultStreamedCompleted += new EventHandler<Service.StoreFinishedJobResultStreamedCompletedEventArgs>(proxy_StoreFinishedJobResultStreamedCompleted);
     98        proxy.ProcessSnapshotStreamedCompleted += new EventHandler<Service.ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
     99        proxy.ProcessHeartBeatCompleted += new EventHandler<Service.ProcessHeartBeatCompletedEventArgs>(proxy_ProcessHeartBeatCompleted);
    99100        Logger.Debug("Registered new Events");
    100101        Logger.Debug("Opening the Connection");
     
    164165    /// </summary>
    165166    #region Login
    166     public event System.EventHandler<LoginCompletedEventArgs> LoginCompleted;
     167    public event System.EventHandler<Service.LoginCompletedEventArgs> LoginCompleted;
    167168    public void LoginAsync(ClientDto clientInfo) {
    168169      if (ConnState == NetworkEnum.WcfConnState.Connected) {
     
    171172      }
    172173    }
    173     private void proxy_LoginCompleted(object sender, LoginCompletedEventArgs e) {
     174    private void proxy_LoginCompleted(object sender, Service.LoginCompletedEventArgs e) {
    174175      if (e.Error == null) {
    175176        Logger.Debug("ENDED: Login Async");
     
    183184        if (ConnState == NetworkEnum.WcfConnState.Connected) {
    184185          Logger.Debug("STARTED: Login Sync");
    185           Response res = proxy.Login(clientInfo);
     186          HeuristicLab.Hive.Contracts.Response res = proxy.Login(clientInfo);
    186187          if (!res.Success) {
    187188            Logger.Error("FAILED: Login Failed! " + res.StatusMessage);
     
    204205    /// </summary>
    205206    #region PullJob
    206     public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
     207    public event System.EventHandler<Service.SendJobCompletedEventArgs> SendJobCompleted;
    207208    public void SendJobAsync(Guid guid) {
    208209      if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
     
    212213    }
    213214
    214     void proxy_SendStreamedJobCompleted(object sender, SendStreamedJobCompletedEventArgs e) {
     215    void proxy_SendStreamedJobCompleted(object sender, Service.SendStreamedJobCompletedEventArgs e) {
    215216      if (e.Error == null) {
    216217        Logger.Debug("ENDED: Fetching of Jobs from Server for Client");
     
    238239          memStream.Close();
    239240
    240           SendJobCompletedEventArgs completedEventArgs =
    241             new SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
     241          Service.SendJobCompletedEventArgs completedEventArgs =
     242            new Service.SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
    242243          SendJobCompleted(sender, completedEventArgs);
    243244        } catch (Exception ex) {
     
    260261    /// </summary>
    261262    #region SendJobResults
    262     public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
     263    public event System.EventHandler<Service.StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
    263264    public void StoreFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
    264265      if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
     
    272273      }
    273274     }
    274     private void proxy_StoreFinishedJobResultStreamedCompleted(object sender, StoreFinishedJobResultStreamedCompletedEventArgs e) {
     275    private void proxy_StoreFinishedJobResultStreamedCompleted(object sender, Service.StoreFinishedJobResultStreamedCompletedEventArgs e) {
    275276      Logger.Debug("Finished storing the job");
    276277      Stream stream =
     
    281282      }
    282283      if (e.Error == null) {
    283         StoreFinishedJobResultCompletedEventArgs args =
    284           new StoreFinishedJobResultCompletedEventArgs(
     284        Service.StoreFinishedJobResultCompletedEventArgs args =
     285          new Service.StoreFinishedJobResultCompletedEventArgs(
    285286            new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
    286287        Logger.Debug("calling the Finished Job Event");
     
    294295
    295296    #region Processsnapshots
    296     public event System.EventHandler<ProcessSnapshotCompletedEventArgs> ProcessSnapshotCompleted;
     297    public event System.EventHandler<Service.ProcessSnapshotCompletedEventArgs> ProcessSnapshotCompleted;
    297298    public void ProcessSnapshotAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
    298299      if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
     
    303304      }
    304305    }
    305     void proxy_ProcessSnapshotStreamedCompleted(object sender, ProcessSnapshotStreamedCompletedEventArgs e) {
     306    void proxy_ProcessSnapshotStreamedCompleted(object sender, Service.ProcessSnapshotStreamedCompletedEventArgs e) {
    306307      Stream stream =
    307308        (Stream)e.UserState;
     
    310311     
    311312      if (e.Error == null) {
    312         ProcessSnapshotCompletedEventArgs args =
    313           new ProcessSnapshotCompletedEventArgs(
     313        Service.ProcessSnapshotCompletedEventArgs args =
     314          new Service.ProcessSnapshotCompletedEventArgs(
    314315            new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
    315316
     
    326327    #region Heartbeat
    327328
    328     public event System.EventHandler<ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
     329    public event System.EventHandler<Service.ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
    329330    public void ProcessHeartBeatAsync(HeartBeatData hbd) {
    330331      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
     
    333334    }
    334335
    335     private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
     336    private void proxy_ProcessHeartBeatCompleted(object sender, Service.ProcessHeartBeatCompletedEventArgs e) {
    336337      if (e.Error == null && e.Result.Success) {
    337338        ProcessHeartBeatCompleted(sender, e);
     
    406407    }
    407408
    408     public List<CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
     409    public List<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
    409410      try {
    410411        Logger.Debug("STARTED: Requesting Plugins for Job");
     
    451452    }
    452453
    453     public Response SetCalendarStatus (Guid clientId, CalendarState state) {
     454    public Response SetCalendarStatus(Guid clientId, CalendarState state) {
    454455      try {
    455456        Logger.Debug("STARTED: Setting Calendar status to: " + state);
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs

    r4078 r4091  
    5757// by using the '*' as shown below:
    5858// [assembly: AssemblyVersion("1.0.*")]
    59 [assembly: AssemblyVersion("3.3.0.4077")]
    60 [assembly: AssemblyFileVersion("3.3.0.4077")]
    61 [assembly: AssemblyBuildDate("2010/07/22 13:53:38")]
     59[assembly: AssemblyVersion("3.3.0.4078")]
     60[assembly: AssemblyFileVersion("3.3.0.4078")]
     61[assembly: AssemblyBuildDate("2010/07/22 16:16:39")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.ExecutionEngine/3.3/Executor.cs

    r4078 r4091  
    2424using HeuristicLab.Hive.Contracts;
    2525using HeuristicLab.Hive.JobBase;
     26using HeuristicLab.Persistence.Core;
    2627
    2728namespace HeuristicLab.Hive.Client.ExecutionEngine {
     
    5051    public void Start(byte[] serializedJob) {
    5152      CreationTime = DateTime.Now;
    52       Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
     53      throw new NotImplementedException("TODO[chn] use persistency-3.3");
     54      // Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
     55     
    5356      //debug
    54       //Job = new TestJob();
     57      Job = new TestJob();
     58
    5559      Job.JobStopped += new EventHandler(Job_JobStopped);
    5660      Job.JobFailed += new EventHandler(Job_JobFailed);
     
    114118
    115119    private byte[] SerializeJobObject() {
    116       return PersistenceManager.SaveToGZip(Job);
     120      throw new NotImplementedException("TODO[chn] use persistency-3.3");
     121      return null; // PersistenceManager.SaveToGZip(Job);
    117122    }
    118123
    119124    private void RestoreJobObject(byte[] sjob) {
    120       Job = (IJob)PersistenceManager.RestoreFromGZip(sjob);
     125      throw new NotImplementedException("TODO[chn] use persistency-3.3");
     126      //Job = (IJob)PersistenceManager.RestoreFromGZip(sjob);
    121127    }
    122128
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.ExecutionEngine/3.3/HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj

    r4078 r4091  
    7676  </PropertyGroup>
    7777  <ItemGroup>
     78    <Reference Include="HeuristicLab.Persistence-3.3">
     79      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     80    </Reference>
    7881    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    7982      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HiveContractPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Hive.Server {
    28   [Plugin("HeuristicLab.Hive.Contracts-3.3")]
     28  [Plugin("HeuristicLab.Hive.Contracts", "3.3")]
    2929  [PluginFile("HeuristicLab.Hive.Contracts-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
    31   [PluginDependency("HeuristicLab.DataAccess-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
     31  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
    3232  public class HiveServerContracts : PluginBase {
    3333  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLab.Hive.Engine-3.3.csproj

    r4078 r4091  
    103103      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    104104    </Reference>
     105    <Reference Include="HeuristicLab.SequentialEngine-3.3">
     106      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Tracing-3.3">
     109      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     110    </Reference>
    105111    <Reference Include="System" />
    106112    <Reference Include="System.Core">
     
    125131    <Compile Include="HeuristicLabHiveEnginePlugin.cs" />
    126132    <Compile Include="HiveEngine.cs" />
    127     <Compile Include="HiveEngineEditor.cs" />
    128     <Compile Include="HiveEngineEditor.Designer.cs">
    129       <DependentUpon>HiveEngineEditor.cs</DependentUpon>
    130     </Compile>
    131133    <Compile Include="Properties\AssemblyInfo.cs" />
    132134    <Compile Include="ServiceLocator.cs" />
    133135  </ItemGroup>
    134136  <ItemGroup>
     137    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     138      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     139      <Name>HeuristicLab.DataAccess-3.3</Name>
     140    </ProjectReference>
    135141    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    136142      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     
    145151    <None Include="HeuristicLab.snk" />
    146152    <None Include="Properties\AssemblyInfo.frame" />
    147   </ItemGroup>
    148   <ItemGroup>
    149     <EmbeddedResource Include="HiveEngineEditor.resx">
    150       <DependentUpon>HiveEngineEditor.cs</DependentUpon>
    151       <SubType>Designer</SubType>
    152     </EmbeddedResource>
    153153  </ItemGroup>
    154154  <ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLabHiveEnginePlugin.cs

    r4077 r4091  
    2929  /// Plugin class for HeuristicLab.Hive.Engine plugin.
    3030  /// </summary>
    31   [Plugin("HeuristicLab.Hive.Engine-3.3")]
     31  [Plugin("HeuristicLab.Hive.Engine", "3.3")]
    3232  [PluginFile("HeuristicLab.Hive.Engine-3.3.dll", PluginFileType.Assembly)]
    33   [PluginDependency("HeuristicLab.Common","3.3.0.0")]
    34   [PluginDependency("HeuristicLab.Core-3.3")]
    35   [PluginDependency("HeuristicLab.Data-3.3")]
    36   [PluginDependency("HeuristicLab.DataAccess-3.3")]
    37   [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
    38   [PluginDependency("HeuristicLab.Hive.JobBase-3.3")]
    39   [PluginDependency("HeuristicLab.SequentialEngine-3.3")]
    40   [PluginDependency("HeuristicLab.Tracing","3.3.0.0")]
     33  [PluginDependency("HeuristicLab.Common", "3.3")]
     34  [PluginDependency("HeuristicLab.Core", "3.3")]
     35  [PluginDependency("HeuristicLab.Data", "3.3")]
     36  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
     37  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
     38  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
     39  [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
     40  [PluginDependency("HeuristicLab.Tracing", "3.3")]
    4141  public class HeuristicLabHiveEnginePlugin : PluginBase {
    4242  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HiveEngine.cs

    r4042 r4091  
    4141  /// in parallel.
    4242  /// </summary>
    43   public class HiveEngine : ItemBase, IEngine, IEditable {
     43  public class HiveEngine : HeuristicLab.Core.Engine {
    4444    private const int SNAPSHOT_POLLING_INTERVAL_MS = 1000;
    4545    private const int RESULT_POLLING_INTERVAL_MS = 10000;
     
    6060    }
    6161
    62     #region IEngine Members
    63 
    64     public IOperatorGraph OperatorGraph {
    65       get { return job.Engine.OperatorGraph; }
    66     }
    67 
    68     public IScope GlobalScope {
    69       get { return job.Engine.GlobalScope; }
    70     }
     62    //public OperatorGraph OperatorGraph {
     63    //  get { return job.Engine.OperatorGraph; }
     64    //}
     65
     66    //public IScope GlobalScope {
     67    //  get { return job.Engine.GlobalScope; }
     68    //}
    7169
    7270    public TimeSpan ExecutionTime {
     
    7573
    7674    public ThreadPriority Priority {
    77       get { return job.Engine.Priority; }
    78       set { job.Engine.Priority = value; }
    79     }
    80 
    81     public bool Running {
    82       get { return job.Engine.Running; }
    83     }
    84 
    85     public bool Canceled {
    86       get { return job.Engine.Canceled; }
    87     }
    88 
    89     public bool Terminated {
    90       get { return job.Engine.Terminated; }
    91     }
    92 
    93     public void Execute() {
     75      get { return this.Priority; }
     76      set { this.Priority = value; }
     77    }
     78
     79    //public bool Running {
     80    //  get { return job.Engine.ExecutionState == Core.ExecutionState.Started; }
     81    //}
     82
     83    //public bool Canceled {
     84    //  get { return job.Engine.Canceled; }
     85    //}
     86
     87    //public bool Terminated {
     88    //  get { return job.Engine.Terminated; }
     89    //}
     90
     91    public ExecutionState ExecutionState {
     92      get { return job.Engine.ExecutionState; }
     93    }
     94
     95    protected override void ProcessNextOperation() {
    9496      var jobObj = CreateJobObj();
    9597      IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
     
    9799      List<string> groups = new List<string>();
    98100      if (!String.Empty.Equals(RessourceIds)) {
    99         groups.AddRange(RessourceIds.Split(';'));       
     101        groups.AddRange(RessourceIds.Split(';'));
    100102      }
    101103
     
    110112          }   
    111113        }
    112       } */     
     114      } */
    113115
    114116      int loops = 1;
    115      
     117
    116118      Int32.TryParse(MultiSubmitCount, out loops);
    117       if(loops == 0)
     119      if (loops == 0)
    118120        loops = 1;
    119121
     
    122124        jobId = res.Obj.Id;
    123125      }
    124      
     126
    125127      StartResultPollingThread();
    126128    }
     
    144146            // 4. the result that we get from the server is a snapshot and not the final result
    145147            if (abortRequested) return;
    146               if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
     148            if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
    147149              Logger.Debug("HiveEngine: Results-polling - Got result!");
    148               restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
     150              throw new NotImplementedException("TODO[chn]use persistency-3.3");
     151              //restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
    149152              Logger.Debug("HiveEngine: Results-polling - IsSnapshotResult: " + (restoredJob.Progress < 1.0));
    150153            }
     
    153156
    154157        job = restoredJob;
    155         ControlManager.Manager.ShowControl(job.Engine.CreateView());
    156         OnChanged();
    157         OnFinished();
     158
     159        //ControlManager.Manager.ShowControl(job.Engine.CreateView());
     160        //OnChanged();
     161
     162        //OnFinished();
    158163      });
    159164      Logger.Debug("HiveEngine: Starting results-polling thread");
     
    161166    }
    162167
    163     public void RequestSnapshot() {
    164       IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
    165       int retryCount = 0;
    166       ResponseObject<SerializedJob> response;
    167       lock (locker) {
    168         Logger.Debug("HiveEngine: Abort - RequestSnapshot");
    169         Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
    170         if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
    171           // job is finished already
    172           Logger.Debug("HiveEngine: Abort - GetLastResult(false)");
    173           response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
    174           Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
    175         } else {
    176           // server sent snapshot request to client
    177           // poll until snapshot is ready
    178           do {
    179             Thread.Sleep(SNAPSHOT_POLLING_INTERVAL_MS);
    180             Logger.Debug("HiveEngine: Abort - GetLastResult(true)");
    181             response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
    182             Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
    183             retryCount++;
    184             // loop while
    185             // 1. problem with communication with server
    186             // 2. job result not yet ready
    187           } while (
    188             (retryCount < MAX_SNAPSHOT_RETRIES) && (
    189             !response.Success ||
    190             response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
    191             );
    192         }
    193       }
    194       SerializedJob jobResult = response.Obj;
    195       if (jobResult != null) {
    196         Logger.Debug("HiveEngine: Results-polling - Got result!");
    197         job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobData);
    198         ControlManager.Manager.ShowControl(job.Engine.CreateView());
    199       }
    200       //HiveLogger.Debug("HiveEngine: Results-polling - Exception!");
    201       //Exception ex = new Exception(response.Obj.Exception.Message);
    202       //ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
    203     }
    204 
    205     public void ExecuteStep() {
    206       throw new NotSupportedException();
    207     }
    208 
    209     public void ExecuteSteps(int steps) {
    210       throw new NotSupportedException();
    211     }
    212 
    213     public void Abort() {
    214       abortRequested = true;
    215       // RequestSnapshot();
    216       IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
    217       executionEngineFacade.AbortJob(jobId);
    218       OnChanged();
    219       OnFinished();
    220     }
    221 
    222     public void Reset() {
    223       abortRequested = false;
    224       job.Engine.Reset();
    225       jobId = Guid.NewGuid();
    226       OnInitialized();
    227     }
    228 
    229168    private HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob CreateJobObj() {
    230169      HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj =
    231170        new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
    232171
    233       MemoryStream memStream = new MemoryStream();
    234       GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
    235       XmlDocument document = PersistenceManager.CreateXmlDocument();
    236       Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
    237       XmlNode rootNode = document.CreateElement("Root");
    238       document.AppendChild(rootNode);
    239       rootNode.AppendChild(PersistenceManager.Persist(job, document, dictionary));
    240       document.Save(stream);
    241       stream.Close();
    242 
    243       HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob executableJobObj =
    244         new HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob();
    245       executableJobObj.JobInfo = jobObj;
    246       executableJobObj.SerializedJobData = memStream.ToArray();
    247 
    248       List<IPluginDescription> plugins = new List<IPluginDescription>();
    249 
    250       foreach (IStorable storeable in dictionary.Values) {
    251         IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
    252         if (!plugins.Contains(pluginInfo)) {
    253           plugins.Add(pluginInfo);
    254           foreach (var dependency in pluginInfo.Dependencies) {
    255             if (!plugins.Contains(dependency)) plugins.Add(dependency);
    256           }
    257         }
    258       }
    259 
    260       List<HivePluginInfoDto> pluginsNeeded =
    261         new List<HivePluginInfoDto>();
    262       foreach (IPluginDescription uniquePlugin in plugins) {
    263         HivePluginInfoDto pluginInfo =
    264           new HivePluginInfoDto();
    265         pluginInfo.Name = uniquePlugin.Name;
    266         pluginInfo.Version = uniquePlugin.Version;
    267         pluginInfo.BuildDate = uniquePlugin.BuildDate;
    268         pluginsNeeded.Add(pluginInfo);
    269       }
    270 
    271       jobObj.CoresNeeded = 1;
    272       jobObj.PluginsNeeded = pluginsNeeded;
    273       jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
    274       return executableJobObj;
    275     }
    276 
    277     public event EventHandler Initialized;
    278     /// <summary>
    279     /// Fires a new <c>Initialized</c> event.
    280     /// </summary>
    281     protected virtual void OnInitialized() {
    282       if (Initialized != null)
    283         Initialized(this, new EventArgs());
    284     }
    285 
    286     public event EventHandler<EventArgs<IOperation>> OperationExecuted;
    287     /// <summary>
    288     /// Fires a new <c>OperationExecuted</c> event.
    289     /// </summary>
    290     /// <param name="operation">The operation that has been executed.</param>
    291     protected virtual void OnOperationExecuted(IOperation operation) {
    292       if (OperationExecuted != null)
    293         OperationExecuted(this, new EventArgs<IOperation>(operation));
    294     }
    295 
    296     public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
    297     /// <summary>
    298     /// Aborts the execution and fires a new <c>ExceptionOccurred</c> event.
    299     /// </summary>
    300     /// <param name="exception">The exception that was thrown.</param>
    301     protected virtual void OnExceptionOccurred(Exception exception) {
    302       Abort();
    303       if (ExceptionOccurred != null)
    304         ExceptionOccurred(this, new EventArgs<Exception>(exception));
    305     }
    306 
    307     public event EventHandler ExecutionTimeChanged;
    308     /// <summary>
    309     /// Fires a new <c>ExecutionTimeChanged</c> event.
    310     /// </summary>
    311     protected virtual void OnExecutionTimeChanged() {
    312       if (ExecutionTimeChanged != null)
    313         ExecutionTimeChanged(this, new EventArgs());
    314     }
    315 
    316     public event EventHandler Finished;
    317     /// <summary>
    318     /// Fires a new <c>Finished</c> event.
    319     /// </summary>
    320     protected virtual void OnFinished() {
    321       if (Finished != null)
    322         Finished(this, new EventArgs());
    323     }
    324 
    325     #endregion
    326 
    327     public override IView CreateView() {
    328       return new HiveEngineEditor(this);
    329     }
    330 
    331     #region IEditable Members
    332 
    333     public IEditor CreateEditor() {
    334       return new HiveEngineEditor(this);
    335     }
    336     #endregion
    337 
    338     public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
    339       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    340       XmlAttribute attr = document.CreateAttribute("HiveServerUrl");
    341       attr.Value = HiveServerUrl;
    342       node.Attributes.Append(attr);
    343       node.AppendChild(PersistenceManager.Persist("Job", job, document, persistedObjects));
    344       return node;
    345     }
    346 
    347     public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    348       base.Populate(node, restoredObjects);
    349       HiveServerUrl = node.Attributes["HiveServerUrl"].Value;
    350       job = (Job)PersistenceManager.Restore(node.SelectSingleNode("Job"), restoredObjects);
    351     }
     172
     173      throw new NotImplementedException("TODO[chn]use persistency-3.3");
     174
     175      //MemoryStream memStream = new MemoryStream();
     176      //GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
     177      //XmlDocument document = PersistenceManager.CreateXmlDocument();
     178      //Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
     179      //XmlNode rootNode = document.CreateElement("Root");
     180      //document.AppendChild(rootNode);
     181      //rootNode.AppendChild(PersistenceManager.Persist(job, document, dictionary));
     182      //document.Save(stream);
     183      //stream.Close();
     184
     185      //HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob executableJobObj =
     186      //  new HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob();
     187      //executableJobObj.JobInfo = jobObj;
     188      //executableJobObj.SerializedJobData = memStream.ToArray();
     189
     190      //List<IPluginDescription> plugins = new List<IPluginDescription>();
     191
     192      //foreach (IStorable storeable in dictionary.Values) {
     193      //  IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
     194      //  if (!plugins.Contains(pluginInfo)) {
     195      //    plugins.Add(pluginInfo);
     196      //    foreach (var dependency in pluginInfo.Dependencies) {
     197      //      if (!plugins.Contains(dependency)) plugins.Add(dependency);
     198      //    }
     199      //  }
     200      //}
     201
     202      //List<HivePluginInfoDto> pluginsNeeded =
     203      //  new List<HivePluginInfoDto>();
     204      //foreach (IPluginDescription uniquePlugin in plugins) {
     205      //  HivePluginInfoDto pluginInfo =
     206      //    new HivePluginInfoDto();
     207      //  pluginInfo.Name = uniquePlugin.Name;
     208      //  pluginInfo.Version = uniquePlugin.Version;
     209      //  pluginInfo.BuildDate = uniquePlugin.BuildDate;
     210      //  pluginsNeeded.Add(pluginInfo);
     211      //}
     212
     213      //jobObj.CoresNeeded = 1;
     214      //jobObj.PluginsNeeded = pluginsNeeded;
     215      //jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
     216      //return executableJobObj;
     217    }
     218
     219    //public event EventHandler Initialized;
     220    ///// <summary>
     221    ///// Fires a new <c>Initialized</c> event.
     222    ///// </summary>
     223    //protected virtual void OnInitialized() {
     224    //  if (Initialized != null)
     225    //    Initialized(this, new EventArgs());
     226    //}
     227
     228    //public event EventHandler<EventArgs<IOperation>> OperationExecuted;
     229    ///// <summary>
     230    ///// Fires a new <c>OperationExecuted</c> event.
     231    ///// </summary>
     232    ///// <param name="operation">The operation that has been executed.</param>
     233    //protected virtual void OnOperationExecuted(IOperation operation) {
     234    //  if (OperationExecuted != null)
     235    //    OperationExecuted(this, new EventArgs<IOperation>(operation));
     236    //}
     237
     238    //public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
     239    ///// <summary>
     240    ///// Aborts the execution and fires a new <c>ExceptionOccurred</c> event.
     241    ///// </summary>
     242    ///// <param name="exception">The exception that was thrown.</param>
     243    //protected virtual void OnExceptionOccurred(Exception exception) {
     244    //  Abort();
     245    //  if (ExceptionOccurred != null)
     246    //    ExceptionOccurred(this, new EventArgs<Exception>(exception));
     247    //}
     248
     249    //public event EventHandler ExecutionTimeChanged;
     250    ///// <summary>
     251    ///// Fires a new <c>ExecutionTimeChanged</c> event.
     252    ///// </summary>
     253    //protected virtual void OnExecutionTimeChanged() {
     254    //  if (ExecutionTimeChanged != null)
     255    //    ExecutionTimeChanged(this, new EventArgs());
     256    //}
     257
     258    //public event EventHandler Finished;
     259    ///// <summary>
     260    ///// Fires a new <c>Finished</c> event.
     261    ///// </summary>
     262    //protected virtual void OnFinished() {
     263    //  if (Finished != null)
     264    //    Finished(this, new EventArgs());
     265    //}
     266
     267    //public void Abort() {
     268    //  abortRequested = true;
     269    //  // RequestSnapshot();
     270    //  IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
     271    //  executionEngineFacade.AbortJob(jobId);
     272    //  //OnChanged();
     273    //  OnFinished();
     274    //}
     275
     276    //public void Reset() {
     277    //  abortRequested = false;
     278
     279    //  throw new NotImplementedException("[chn] how to reset Engine?");
     280    //  //job.Engine.Reset();
     281
     282    //  jobId = Guid.NewGuid();
     283    //  OnInitialized();
     284    //}
     285
     286    //public void RequestSnapshot() {
     287    //  IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
     288    //  int retryCount = 0;
     289    //  ResponseObject<SerializedJob> response;
     290    //  lock (locker) {
     291    //    Logger.Debug("HiveEngine: Abort - RequestSnapshot");
     292    //    Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
     293    //    if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
     294    //      // job is finished already
     295    //      Logger.Debug("HiveEngine: Abort - GetLastResult(false)");
     296    //      response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
     297    //      Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
     298    //    } else {
     299    //      // server sent snapshot request to client
     300    //      // poll until snapshot is ready
     301    //      do {
     302    //        Thread.Sleep(SNAPSHOT_POLLING_INTERVAL_MS);
     303    //        Logger.Debug("HiveEngine: Abort - GetLastResult(true)");
     304    //        response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
     305    //        Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
     306    //        retryCount++;
     307    //        // loop while
     308    //        // 1. problem with communication with server
     309    //        // 2. job result not yet ready
     310    //      } while (
     311    //        (retryCount < MAX_SNAPSHOT_RETRIES) && (
     312    //        !response.Success ||
     313    //        response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
     314    //        );
     315    //    }
     316    //  }
     317    //  SerializedJob jobResult = response.Obj;
     318    //  if (jobResult != null) {
     319    //    Logger.Debug("HiveEngine: Results-polling - Got result!");
     320
     321    //    //job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobData);
     322    //    //ControlManager.Manager.ShowControl(job.Engine.CreateView());
     323    //    throw new NotImplementedException("TODO[chn]use persistency-3.3");
     324    //  }
     325    //  //HiveLogger.Debug("HiveEngine: Results-polling - Exception!");
     326    //  //Exception ex = new Exception(response.Obj.Exception.Message);
     327    //  //ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
     328    //}
     329
     330    //public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
     331    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
     332    //  XmlAttribute attr = document.CreateAttribute("HiveServerUrl");
     333    //  attr.Value = HiveServerUrl;
     334    //  node.Attributes.Append(attr);
     335    //  node.AppendChild(PersistenceManager.Persist("Job", job, document, persistedObjects));
     336    //  return node;
     337    //}
     338
     339    //public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     340    //  base.Populate(node, restoredObjects);
     341    //  HiveServerUrl = node.Attributes["HiveServerUrl"].Value;
     342    //  job = (Job)PersistenceManager.Restore(node.SelectSingleNode("Job"), restoredObjects);
     343    //}
     344
     345
    352346  }
    353347}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/Job.cs

    r3472 r4091  
    3232namespace HeuristicLab.Hive.Engine {
    3333  /// <summary>
    34   /// Represents an job that wraps an engine that should be executed in the hive.
     34  /// Represents a job that wraps an engine that should be executed in the hive.
    3535  /// </summary>
    36   public class Job : StorableBase, IJob {
     36  public class Job : IJob {
    3737    private IEngine engine;
    3838    public IEngine Engine {
     
    4242    public Job()
    4343      : base() {
     44     
    4445      engine = new SequentialEngine.SequentialEngine();
    45       engine.Priority = ThreadPriority.Lowest;
     46      //engine.Priority = ThreadPriority.Lowest;
    4647      RegisterEvents();
    4748    }
    4849
    4950    private void RegisterEvents() {
    50       engine.Finished += new EventHandler(engine_Finished);
     51      engine.Stopped += new EventHandler(engine_Stopped);
    5152      engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
    5253    }
    5354
    5455    private void DeregisterEvents() {
    55       engine.Finished -= new EventHandler(engine_Finished);
     56      engine.Stopped -= new EventHandler(engine_Stopped);
    5657      engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
    5758    }
    5859
    59     void engine_Finished(object sender, EventArgs e) {
    60       if (Engine.Canceled) this.progress = 0.0;
     60    void engine_Stopped(object sender, EventArgs e) {
     61      if (Engine.ExecutionState != ExecutionState.Stopped) this.progress = 0.0;
    6162      else this.progress = 1.0;
    6263      var listeners = JobStopped;
     
    8687    public double Progress {
    8788      get {
    88         DoubleData progress = Engine.GlobalScope.GetVariableValue<DoubleData>("Progress", false,
    89           false);
    90         return progress == null ? this.progress : progress.Data;
     89        //DoubleValue progress = Engine.GlobalScope.GetVariableValue<DoubleData>("Progress", false, false); [chn] not possible in 3.3?
     90
     91        return engine.ExecutionState == ExecutionState.Stopped ? 1.0 : 0.0;
    9192      }
    9293      set { throw new NotSupportedException(); }
     
    9596    public bool Running {
    9697      get {
    97         return Engine.Running;
     98        return Engine.ExecutionState == ExecutionState.Started;
    9899      }
    99100      set {
     
    107108
    108109    public void Start() {
    109       Engine.Execute();
     110      Engine.Start();
    110111    }
    111112
    112113    public void Stop() {
    113       Engine.Abort();
     114      Engine.Stop();
    114115    }
    115116
    116117    #endregion
    117118
    118     public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
    119       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    120       XmlAttribute idAttr = document.CreateAttribute("JobId");
    121       idAttr.Value = XmlConvert.ToString(JobId);
    122       XmlAttribute progressAttr = document.CreateAttribute("Progress");
    123       progressAttr.Value = XmlConvert.ToString(progress);
    124       node.Attributes.Append(idAttr);
    125       node.Attributes.Append(progressAttr);
    126       node.AppendChild(PersistenceManager.Persist("Engine", Engine, document, persistedObjects));
    127       return node;
    128     }
    129     public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    130       base.Populate(node, restoredObjects);
    131       JobId = XmlConvert.ToInt64(node.Attributes["JobId"].Value);
    132       progress = XmlConvert.ToDouble(node.Attributes["Progress"].Value);
    133       DeregisterEvents();
    134       engine = (SequentialEngine.SequentialEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
    135       RegisterEvents();
    136     }
     119    //public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
     120    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
     121    //  XmlAttribute idAttr = document.CreateAttribute("JobId");
     122    //  idAttr.Value = XmlConvert.ToString(JobId);
     123    //  XmlAttribute progressAttr = document.CreateAttribute("Progress");
     124    //  progressAttr.Value = XmlConvert.ToString(progress);
     125    //  node.Attributes.Append(idAttr);
     126    //  node.Attributes.Append(progressAttr);
     127    //  node.AppendChild(PersistenceManager.Persist("Engine", Engine, document, persistedObjects));
     128    //  return node;
     129    //}
     130    //public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     131    //  base.Populate(node, restoredObjects);
     132    //  JobId = XmlConvert.ToInt64(node.Attributes["JobId"].Value);
     133    //  progress = XmlConvert.ToDouble(node.Attributes["Progress"].Value);
     134    //  DeregisterEvents();
     135    //  engine = (SequentialEngine.SequentialEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
     136    //  RegisterEvents();
     137    //}
    137138  }
    138139}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj

    r4078 r4091  
    9494      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    9595    </Reference>
     96    <Reference Include="HeuristicLab.Persistence-3.3">
     97      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     98    </Reference>
    9699    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    97100      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/Interfaces/IJob.cs

    r1655 r4091  
    11using System;
    22using HeuristicLab.Core;
     3using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     4
    35namespace HeuristicLab.Hive.JobBase {
    4   public interface IJob: IStorable {
     6  public interface IJob {
     7    long JobId { get; set; }
     8    bool Running { get; set; }
     9    double Progress { get; }
     10    void Run();
     11    void Start();
     12    void Stop();
     13
    514    event EventHandler JobStopped;
    615    event EventHandler JobFailed;
    7     long JobId { get; set; }
    8     double Progress { get; }
    9     void Run();
    10     bool Running { get; set; }
    11     void Start();
    12     void Stop();
    1316  }
    1417}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobBase.cs

    r1655 r4091  
    2727using System.Xml;
    2828using HeuristicLab.Core;
     29using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2930
    3031namespace HeuristicLab.Hive.JobBase {
    3132  [Serializable]
    32   abstract public class JobBase : StorableBase, IJob {
     33  [StorableClass]
     34  abstract public class JobBase : IJob {
    3335
    3436    private Thread thread = null;
     
    3638    public event EventHandler JobFailed;
    3739   
    38     public long JobId { get; set; }   
    39     public double Progress { get; set; }       
     40    [Storable]
     41    public long JobId { get; set; }
     42
     43    [Storable]
     44    public double Progress { get; set; }
     45
     46    [Storable]
    4047    public bool Running { get; set; }
    41    
     48
     49    [Storable]
    4250    protected bool abort = false;   
    4351
     
    7078    }
    7179
    72     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
    73       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
     80    //public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
     81    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    7482
    75       XmlNode progr = document.CreateNode(XmlNodeType.Element, "Progress", null);
    76       progr.InnerText = Convert.ToString(Progress);
     83    //  XmlNode progr = document.CreateNode(XmlNodeType.Element, "Progress", null);
     84    //  progr.InnerText = Convert.ToString(Progress);
    7785
    78       node.AppendChild(progr);
    79       return node;
    80     }
    81     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    82       base.Populate(node, restoredObjects);
     86    //  node.AppendChild(progr);
     87    //  return node;
     88    //}
     89    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     90    //  base.Populate(node, restoredObjects);
    8391
    84       XmlNode progr = node.SelectSingleNode("Progress");
    85       Progress = Convert.ToDouble(progr.InnerText);
    86     }
     92    //  XmlNode progr = node.SelectSingleNode("Progress");
     93    //  Progress = Convert.ToDouble(progr.InnerText);
     94    //}
    8795
    8896    public JobBase() {   
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobPlugin.cs

    r4078 r4091  
    66
    77namespace HeuristicLab.Hive.JobBase {
    8   [Plugin("HeuristicLab.Hive.JobBase-3.3")]
     8  [Plugin("HeuristicLab.Hive.JobBase", "3.3")]
    99  [PluginFile("HeuristicLab.Hive.JobBase-3.3.dll", PluginFileType.Assembly)]
    10   [PluginDependency("HeuristicLab.Core-3.3")]
     10  [PluginDependency("HeuristicLab.Core", "3.3")]
     11  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    1112  public class JobBasePlugin: PluginBase {
    1213  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/TestJob.cs

    r1718 r4091  
    2929using System.IO;
    3030using System.Security.Permissions;
     31using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3132
    3233namespace HeuristicLab.Hive.JobBase {
    3334  [Serializable]
     35  [StorableClass]
    3436  public class TestJob: JobBase {
    3537
     38    [Storable]
    3639    private int runValue = 0;
     40
     41    public TestJob() {
     42    }
    3743
    3844    public override void Run() {
     
    5258      OnJobStopped();
    5359    }
    54     public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, HeuristicLab.Core.IStorable> persistedObjects) {     
    55       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
     60
     61    //public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, HeuristicLab.Core.IStorable> persistedObjects) {     
     62    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    5663   
    57       XmlNode startValue = document.CreateNode(XmlNodeType.Element, "StartValue", null);
    58       startValue.InnerText = Convert.ToString(runValue);
     64    //  XmlNode startValue = document.CreateNode(XmlNodeType.Element, "StartValue", null);
     65    //  startValue.InnerText = Convert.ToString(runValue);
    5966     
    60       node.AppendChild(startValue);
    61       return node;
    62     }
     67    //  node.AppendChild(startValue);
     68    //  return node;
     69    //}
    6370
    64     public override void Populate(XmlNode node, IDictionary<Guid, HeuristicLab.Core.IStorable> restoredObjects) {
    65       base.Populate(node, restoredObjects);
     71    //public override void Populate(XmlNode node, IDictionary<Guid, HeuristicLab.Core.IStorable> restoredObjects) {
     72    //  base.Populate(node, restoredObjects);
    6673
    67       XmlNode startValue = node.SelectSingleNode("StartValue");
    68       runValue = Convert.ToInt32(startValue.InnerText);
    69     }
    70 
    71     public TestJob() {
    72     }
    73 
    74 
     74    //  XmlNode startValue = node.SelectSingleNode("StartValue");
     75    //  runValue = Convert.ToInt32(startValue.InnerText);
     76    //}
    7577  }
    7678}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs

    r4060 r4091  
    2222using System;
    2323using System.Collections.Generic;
     24using System.IO;
    2425using System.Linq;
    25 using System.Text;
     26using System.Runtime.Serialization.Formatters.Binary;
     27using System.Threading;
     28using System.Transactions;
     29using HeuristicLab.Hive.Contracts;
    2630using HeuristicLab.Hive.Contracts.BusinessObjects;
    2731using HeuristicLab.Hive.Contracts.Interfaces;
    28 using HeuristicLab.Hive.Contracts;
    29 using HeuristicLab.Core;
    30 using HeuristicLab.Hive.Server.DataAccess;
    31 using System.Resources;
    32 using System.Reflection;
    33 using HeuristicLab.Hive.JobBase;
    3432using HeuristicLab.Hive.Server.Core.InternalInterfaces;
    35 using System.Threading;
    3633using HeuristicLab.PluginInfrastructure;
    37 using HeuristicLab.DataAccess.Interfaces;
    38 using System.IO;
    39 using System.Runtime.Serialization.Formatters.Binary;
    4034using HeuristicLab.Tracing;
    41 using Linq = HeuristicLab.Hive.Server.LINQDataAccess;
    42 using System.Transactions;
    43 using HeuristicLab.Hive.Server.LINQDataAccess;
    4435
    4536namespace HeuristicLab.Hive.Server.Core {
     
    7566
    7667      lifecycleManager = ServiceLocator.GetLifecycleManager();
    77       jobManager = ServiceLocator.GetJobManager() as
    78         IInternalJobManager;
     68      jobManager = ServiceLocator.GetJobManager() as IInternalJobManager;
    7969      scheduler = ServiceLocator.GetScheduler();
    8070
    81       lifecycleManager.RegisterHeartbeat(
    82         new EventHandler(lifecycleManager_OnServerHeartbeat));
     71      lifecycleManager.RegisterHeartbeat(new EventHandler(lifecycleManager_OnServerHeartbeat));
    8372    }
    8473
     
    10998              foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
    11099                //maybe implementa n additional Watchdog? Till then, just set them offline..
    111                 DaoLocator.JobDao.SetJobOffline(job);                               
     100                DaoLocator.JobDao.SetJobOffline(job);
    112101              }
    113102            } else {
     
    168157            if (pendingJobs[currJob.Id] <= 0) {
    169158              currJob.State = State.offline;
    170               DaoLocator.JobDao.Update(currJob);             
     159              DaoLocator.JobDao.Update(currJob);
    171160            } else {
    172161              pendingJobs[currJob.Id]--;
     
    216205
    217206      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
    218       if(client == null) {
     207      if (client == null) {
    219208        response.Success = false;
    220209        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
    221210        return response;
    222211      }
    223      
     212
    224213      response.ForceFetch = (client.CalendarSyncStatus == CalendarState.ForceFetch);
    225      
     214
    226215      IEnumerable<AppointmentDto> appointments = DaoLocator.UptimeCalendarDao.GetCalendarForClient(client);
    227216      if (appointments.Count() == 0) {
     
    239228
    240229    public Response SetCalendarStatus(Guid clientId, CalendarState state) {
    241       Response response = new Response();     
     230      Response response = new Response();
    242231      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
    243232      if (client == null) {
     
    246235        return response;
    247236      }
    248      
     237
    249238      client.CalendarSyncStatus = state;
    250239      DaoLocator.ClientDao.Update(client);
    251      
     240
    252241      response.Success = true;
    253242      response.StatusMessage = ApplicationConstants.RESPONSE_UPTIMECALENDAR_STATUS_UPDATED;
    254      
     243
    255244      return response;
    256245    }
     
    298287
    299288      Logger.Debug("BEGIN Processing Heartbeat Jobs");
    300       processJobProcess(hbData, response);
     289      ProcessJobProcess(hbData, response);
    301290      Logger.Debug("END Processed Heartbeat Jobs");
    302291
     
    306295        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR;
    307296        response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchOrForceFetchCalendar));
    308        
     297
    309298        //client.CalendarSyncStatus = CalendarState.Fetching;
    310        
    311         Logger.Info("fetch or forcefetch sent");       
     299
     300        Logger.Info("fetch or forcefetch sent");
    312301      }
    313302
     
    338327    /// <param name="clientAdapter"></param>
    339328    /// <param name="response"></param>
    340     private void processJobProcess(HeartBeatData hbData, ResponseHB response) {
     329    private void ProcessJobProcess(HeartBeatData hbData, ResponseHB response) {
    341330      Logger.Debug("Started for Client " + hbData.ClientId);
    342331      List<JobDto> jobsOfClient = new List<JobDto>(DaoLocator.JobDao.FindActiveJobsOfClient(DaoLocator.ClientDao.FindById(hbData.ClientId)));
    343       if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {       
     332      if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {
    344333        if (jobsOfClient == null || jobsOfClient.Count == 0) {
    345334          response.Success = false;
     
    372361          DaoLocator.JobDao.Update(curJob);
    373362        }
    374        }
     363      }
    375364      foreach (JobDto currJob in jobsOfClient) {
    376365        bool found = false;
    377         if(hbData.JobProgress != null) {
     366        if (hbData.JobProgress != null) {
    378367          foreach (Guid jobId in hbData.JobProgress.Keys) {
    379368            if (jobId == currJob.Id) {
     
    428417      JobDto job2Calculate = scheduler.GetNextJobForClient(clientId);
    429418      if (job2Calculate != null) {
    430         response.Job = job2Calculate;       
     419        response.Job = job2Calculate;
    431420        response.Job.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Job);
    432421        response.Success = true;
     
    437426            newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
    438427        }
    439       } else {                 
     428      } else {
    440429        response.Success = false;
    441430        response.Job = null;
     
    449438    }
    450439
    451     public ResponseResultReceived ProcessJobResult(
    452       Stream stream,
    453       bool finished) {
    454 
     440    public ResponseResultReceived ProcessJobResult(Stream stream, bool finished) {
    455441      Logger.Info("BEGIN Job received for Storage - main method:");
    456442
    457 
    458       Stream jobResultStream = null;
    459       Stream jobStream = null;
     443      //Stream jobResultStream = null;
     444      //Stream jobStream = null;
    460445
    461446      //try {
    462       BinaryFormatter formatter =
    463         new BinaryFormatter();
    464 
    465       JobResult result =
    466         (JobResult)formatter.Deserialize(stream);
     447      BinaryFormatter formatter = new BinaryFormatter();
     448
     449      JobResult result = (JobResult)formatter.Deserialize(stream);
    467450
    468451      //important - repeatable read isolation level is required here,
     
    487470        List<byte> serializedJob = new List<byte>();
    488471        int read = 0;
    489         int i = 0;       
    490         while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {         
     472        int i = 0;
     473        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
    491474          for (int j = 0; j < read; j++) {
    492475            serializedJob.Add(buffer[j]);
    493476          }
    494           if (i% 100 == 0)
    495             Logger.Debug("Writing to stream: " + i);         
     477          if (i % 100 == 0)
     478            Logger.Debug("Writing to stream: " + i);
    496479          //jobStream.Write(buffer, 0, read);
    497480          i++;
    498481        }
    499         Logger.Debug("Done Writing, closing the stream!");               
     482        Logger.Debug("Done Writing, closing the stream!");
    500483        //jobStream.Close();
    501484
     
    518501
    519502      ResponseResultReceived response = new ResponseResultReceived();
    520       ClientDto client =
    521         DaoLocator.ClientDao.FindById(clientId);
    522 
    523       SerializedJob job =
    524         new SerializedJob();
     503      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
     504
     505      SerializedJob job = new SerializedJob();
    525506
    526507      if (job != null) {
    527         job.JobInfo =
    528           DaoLocator.JobDao.FindById(jobId);
     508        job.JobInfo = DaoLocator.JobDao.FindById(jobId);
    529509        job.JobInfo.Client = job.JobInfo.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
    530510      }
     
    650630
    651631      Logger.Info("Client logged out " + clientId);
    652      
     632
    653633      Response response = new Response();
    654634
     
    680660
    681661      return response;
    682     } 
     662    }
    683663
    684664    /// <summary>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DaoLocator.cs

    r4060 r4091  
    6464
    6565    public static void DestroyContext() {
    66       if (ContextFactory.Context != null) {
     66      if (ContextFactory.IsContextNull()) {
    6767        ContextFactory.Context.Dispose();
    6868        ContextFactory.Context = null;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DbTestApp.cs

    r4060 r4091  
    2424using System;
    2525using System.Collections.Generic;
    26 using System.Data.SqlClient;
    27 using System.Text;
     26using System.IO;
     27using System.Threading;
     28using System.Transactions;
     29using HeuristicLab.Hive.Contracts;
     30using HeuristicLab.Hive.Contracts.BusinessObjects;
     31using HeuristicLab.Hive.Server.Core;
     32using HeuristicLab.Hive.Server.LINQDataAccess;
    2833using HeuristicLab.PluginInfrastructure;
    29 using System.Net;
    30 using HeuristicLab.Hive.Contracts;
    31 using HeuristicLab.Hive.Contracts.Interfaces;
    32 using HeuristicLab.Hive.Server.DataAccess;
    33 using HeuristicLab.Hive.Contracts.BusinessObjects;
    34 using System.Diagnostics;
    35 using HeuristicLab.DataAccess.Interfaces;
    36 using System.IO;
    37 using HeuristicLab.Hive.Server.Core;
    38 using HeuristicLab.Core;
    39 using HeuristicLab.Hive.Server.LINQDataAccess;
    40 using System.Transactions;
    41 using System.Threading;
    4234using HeuristicLab.Tracing;
    4335
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

    r4077 r4091  
    7878    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    7979      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     80    </Reference>
     81    <Reference Include="HeuristicLab.Tracing-3.3">
     82      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    8083    </Reference>
    8184    <Reference Include="System" />
     
    136139  </ItemGroup>
    137140  <ItemGroup>
    138     <None Include="app.config" />
    139141    <None Include="HeuristicLab.snk" />
    140142    <EmbeddedResource Include="Authorization\HivePermissionSet.xsd">
     
    161163  </ItemGroup>
    162164  <ItemGroup>
     165    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     166      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     167      <Name>HeuristicLab.DataAccess-3.3</Name>
     168    </ProjectReference>
     169    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
     170      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     171      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
     172    </ProjectReference>
    163173    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.3\HeuristicLab.Hive.Server.DataAccess-3.3.csproj">
    164174      <Project>{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}</Project>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HiveServerCorePlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Hive.Server {
    28   [Plugin("HeuristicLab.Hive.Server.Core-3.3")]
     28  [Plugin("HeuristicLab.Hive.Server.Core", "3.3")]
    2929  [PluginFile("HeuristicLab.Hive.Server.Core-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
    31   [PluginDependency("HeuristicLab.DataAccess-3.3")]
    32   [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
    33   [PluginDependency("HeuristicLab.Hive.JobBase-3.3")]
    34   [PluginDependency("HeuristicLab.Hive.Server.DataAccess-3.3")]
    35   [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess-3.3")]
    36   [PluginDependency("HeuristicLab.Security.Contracts-3.3")]
    37   [PluginDependency("HeuristicLab.Tracing", "3.3.0")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
     31  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
     32  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
     33  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
     34  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
     35  [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
     36  [PluginDependency("HeuristicLab.Security.Contracts", "3.3")]
     37  [PluginDependency("HeuristicLab.Tracing", "3.3")]
    3838  public class HiveServerCorePlugin : PluginBase {
    3939  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs

    r4078 r4091  
    5555// by using the '*' as shown below:
    5656// [assembly: AssemblyVersion("1.0.*")]
    57 [assembly: AssemblyVersion("3.3.0.4077")]
    58 [assembly: AssemblyFileVersion("3.3.0.4077")]
    59 [assembly: AssemblyBuildDate("2010/07/22 13:53:39")]
     57[assembly: AssemblyVersion("3.3.0.4078")]
     58[assembly: AssemblyFileVersion("3.3.0.4078")]
     59[assembly: AssemblyBuildDate("2010/07/23 09:04:35")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HiveServerDataAccessPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Hive.DataAccess {
    28   [Plugin("HeuristicLab.Hive.Server.DataAccess-3.3")]
     28  [Plugin("HeuristicLab.Hive.Server.DataAccess", "3.3")]
    2929  [PluginFile("HeuristicLab.Hive.Server.DataAccess-3.3.dll", PluginFileType.Assembly)] 
    30   [PluginDependency("HeuristicLab.Core-3.3")]
    31   [PluginDependency("HeuristicLab.DataAccess-3.3")]
    32   [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
     31  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
     32  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    3333  public class HiveServerDataAccessPlugin : PluginBase {
    3434  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj

    r4078 r4091  
    125125  </ItemGroup>
    126126  <ItemGroup>
     127    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     128      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     129      <Name>HeuristicLab.DataAccess-3.3</Name>
     130    </ProjectReference>
    127131    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    128132      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     
    138142  </ItemGroup>
    139143  <ItemGroup>
    140     <None Include="app.config" />
    141144    <None Include="Properties\Settings.settings">
    142145      <Generator>SettingsSingleFileGenerator</Generator>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/LINQDataAccessPlugin.cs

    r4077 r4091  
    66
    77namespace HeuristicLab.Hive.Server.LINQDataAccess {
    8   [Plugin("HeuristicLab.Hive.Server.LINQDataAccess-3.3")]
     8  [Plugin("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
    99  [PluginFile("HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll", PluginFileType.Assembly)]
    10   [PluginDependency("HeuristicLab.Core-3.3")]
    11   [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
    12   [PluginDependency("HeuristicLab.Hive.Server.DataAccess-3.3")]
    13   [PluginDependency("HeuristicLab.Tracing", "3.3.0")]
     10  [PluginDependency("HeuristicLab.Core", "3.3")]
     11  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
     12  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
     13  [PluginDependency("HeuristicLab.Tracing", "3.3")]
    1414  public class LINQDataAccessPlugin: PluginBase {
    1515  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Scheduler/3.3/HeuristicLab.Hive.Server.Scheduler-3.3.csproj

    r4077 r4091  
    9393  </ItemGroup>
    9494  <ItemGroup>
    95     <Compile Include="DefaultScheduler.cs" />
    9695    <Compile Include="HiveServerSchedulerPlugin.cs" />
    9796    <Compile Include="Properties\AssemblyInfo.cs" />
     
    105104      <Project>{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}</Project>
    106105      <Name>HeuristicLab.DataAccess.ADOHelper-3.3</Name>
     106    </ProjectReference>
     107    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     108      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     109      <Name>HeuristicLab.DataAccess-3.3</Name>
    107110    </ProjectReference>
    108111    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Scheduler/3.3/HiveServerSchedulerPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Hive.Server {
    28   [Plugin("HeuristicLab.Hive.Server.Scheduler-3.3")]
     28  [Plugin("HeuristicLab.Hive.Server.Scheduler", "3.3")]
    2929  [PluginFile("HeuristicLab.Hive.Server.Scheduler-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
    31   [PluginDependency("HeuristicLab.Hive.Server-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
     31  [PluginDependency("HeuristicLab.Hive.Server", "3.3")]
    3232  public class HiveServerSchedulerPlugin : PluginBase {
    3333  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HiveServerApplication.cs

    r4090 r4091  
    165165      baseAddrDict.Add(STR_ExecutionEngineFacade, StartService(Services.ExecutionEngineFacade, addresses[index], WcfSettings.DEFAULTPORT));
    166166
     167      // [chn] why is lifecyclemanager instantiated here?? shouldnt Core.ServiceLocator be used?
    167168      IEnumerable<ILifecycleManager> lifecycleManagers = ApplicationManager.Manager.GetInstances<ILifecycleManager>();
    168169      if (lifecycleManagers.Count() > 0) {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/ServiceCallInterception.cs

    r4042 r4091  
    3838      Object obj = null;
    3939
    40       Object[] attributes = invocation.Method.GetCustomAttributes(typeof (SpringTransaction), true);
     40      Object[] attributes = invocation.Method.GetCustomAttributes(typeof(SpringTransaction), true);
    4141      foreach (Object o in attributes) {
    42         SpringTransaction st = (SpringTransaction) o;
     42        SpringTransaction st = (SpringTransaction)o;
    4343        userTransaction = st.UserTransaction;
    4444      }
    4545      if (UseTransactions && !userTransaction) {
    4646        using (
    47           TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
    48                                                         new TransactionOptions
    49                                                         {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})) {
     47          TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
    5048          try {
    5149            Logger.Debug("Current Transaction Isolation level is: " + Transaction.Current.IsolationLevel);
     
    6462          }
    6563        }
    66       }
    67       else {
     64      } else {
    6865        try {
    6966          obj = invocation.Proceed();
     
    7976        }
    8077      }
    81       //}       
     78   
    8279      TimeSpan ts = DateTime.Now - start;
    8380      if (ts.Seconds > 2) {
    8481        Logger.Warn("Invocation took: " + ts);
    85       }
    86       else if (ts.Seconds > 10) {
     82      } else if (ts.Seconds > 10) {
    8783        Logger.Error("Invocation took: " + ts);
    88       }
    89       else {
     84      } else {
    9085        Logger.Info("Invocation took: " + ts);
    9186        ;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

    r4071 r4091  
    22; List of project directories and file names separated by ':' that are part of the installation
    33
     4HeuristicLab.DataAccess\3.3:HeuristicLab.DataAccess-3.3.dll
     5HeuristicLab.DataAccess.ADOHelper\3.3:HeuristicLab.DataAccess.ADOHelper-3.3.dll
     6
     7HeuristicLab.Hive.Client.Common\3.3:HeuristicLab.Hive.Client.Common-3.3.dll
     8HeuristicLab.Hive.Client.Communication\3.3:HeuristicLab.Hive.Client.Communication-3.3.dll
     9HeuristicLab.Hive.Client.Console\3.3:Calendar.DayView.dll
     10HeuristicLab.Hive.Client.Console\3.3:HeuristicLab.Hive.Client.Console-3.3.dll
     11HeuristicLab.Hive.Client.Console\3.3:ZedGraph.dll
    412HeuristicLab.Hive.Client.Core\3.3:HeuristicLab.Hive.Client.Core-3.3.dll
     13HeuristicLab.Hive.Client.ExecutionEngine\3.3:HeuristicLab.Hive.Client.ExecutionEngine-3.3.dll
     14
     15HeuristicLab.Hive.Engine\3.3:HeuristicLab.Hive.Engine-3.3.dll
     16HeuristicLab.Hive.JobBase\3.3:HeuristicLab.Hive.JobBase-3.3.dll
     17
     18HeuristicLab.Hive.Server\3.3:HeuristicLab.Hive.Server-3.3.dll
     19HeuristicLab.Hive.Server.ADODataAccess\3.3:HeuristicLab.Hive.Server.ADODataAccess-3.3.dll
     20HeuristicLab.Hive.Server.Console\3.3:HeuristicLab.Hive.Server.Console-3.3.dll
     21HeuristicLab.Hive.Server.Core\3.3:Authorization\*.xml
     22HeuristicLab.Hive.Server.Core\3.3:HeuristicLab.Hive.Contracts-3.3.dll
    523HeuristicLab.Hive.Server.Core\3.3:HeuristicLab.Hive.Server.Core-3.3.dll
     24HeuristicLab.Hive.Server.DataAccess\3.3:HeuristicLab.Hive.Server.DataAccess-3.3.dll
     25HeuristicLab.Hive.Server.LINQDataAccess\3.3:HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll
     26HeuristicLab.Hive.Server.Scheduler\3.3:HeuristicLab.Hive.Server.Scheduler-3.3.dll
     27
     28HeuristicLab.Security.ADODataAccess\3.3:HeuristicLab.Security.ADODataAccess-3.3.dll
     29HeuristicLab.Security.Contracts\3.3:HeuristicLab.Security.Contracts-3.3.dll
     30HeuristicLab.Security.Core\3.3:HeuristicLab.Security.Core-3.3.dll
     31HeuristicLab.Security.DataAccess\3.3:HeuristicLab.Security.DataAccess-3.3.dll
     32HeuristicLab.Security.Server\3.3:HeuristicLab.Security.Server-3.3.dll
    633
    734;External Libraries
    8 
     35HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:HeuristicLab.SpringNET-1.3.0.dll
     36HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Common.Logging.dll
     37HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Spring.Aop.dll
     38HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Spring.Core.dll
     39HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Spring.Services.dll
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

    r4077 r4091  
    2323    <ErrorReport>prompt</ErrorReport>
    2424    <WarningLevel>4</WarningLevel>
     25    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2526  </PropertyGroup>
    2627  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3334  </PropertyGroup>
    3435  <PropertyGroup>
    35     <RunPostBuildEvent>Always</RunPostBuildEvent>
     36    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
    3637  </PropertyGroup>
    3738  <PropertyGroup>
     
    5859  <ItemGroup />
    5960  <ItemGroup>
     61    <None Include="app.config" />
    6062    <None Include="CopyAssemblies.cmd" />
    6163    <None Include="CustomPostBuild.cmd" />
    6264    <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
    63     <None Include="HeuristicLab 3.3.exe.config" />
     65    <None Include="HeuristicLab 3.3.exe.config">
     66      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     67    </None>
    6468    <None Include="HeuristicLab.snk" />
    6569    <None Include="MergeConfigs.cmd" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

    r4071 r4091  
    1 ConfigMerger "%SolutionDir%\HeuristicLab.Hive\3.3\HeuristicLab 3.3.exe.config" "HeuristicLab 3.3.exe.config"
     1ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    22
    3 ;ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\3.3\%Outdir%\HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     3ConfigMerger "HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config"
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs

    r4078 r4091  
    5151//      Revision
    5252//
    53 [assembly: AssemblyVersion("3.3.0.4077")]
    54 [assembly: AssemblyFileVersion("3.3.0.4077")]
     53[assembly: AssemblyVersion("3.3.0.4078")]
     54[assembly: AssemblyFileVersion("3.3.0.4078")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Contracts/3.3/SecurityContractsPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Security.Contracts {
    28   [Plugin("HeuristicLab.Security.Contracts-3.3")]
     28  [Plugin("HeuristicLab.Security.Contracts", "3.3")]
    2929  [PluginFile("HeuristicLab.Security.Contracts-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  public class SecurityContractsPlugin : PluginBase {
    3232  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Core/3.3/HeuristicLab.Security.Core-3.3.csproj

    r4078 r4091  
    124124  </ItemGroup>
    125125  <ItemGroup>
    126     <None Include="app.config" />
    127126    <None Include="HeuristicLab.snk" />
    128127    <None Include="Properties\AssemblyInfo.frame" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Core/3.3/SecurityCorePlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Security.Core {
    28   [Plugin("HeuristicLab.Security.Core-3.3")]
     28  [Plugin("HeuristicLab.Security.Core", "3.3")]
    2929  [PluginFile("HeuristicLab.Security.Core-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  public class SecurityCorePlugin : PluginBase {
    3232  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.DataAccess/3.3/SecurityDataAccessPlugin.cs

    r4077 r4091  
    2626
    2727namespace HeuristicLab.Security.DataAccess {
    28   [Plugin("HeuristicLab.Security.DataAccess-3.3")]
     28  [Plugin("HeuristicLab.Security.DataAccess", "3.3")]
    2929  [PluginFile("HeuristicLab.Security.DataAccess-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Core-3.3")]
     30  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  public class SecurityDataAccessPlugin : PluginBase {
    3232  }
Note: See TracChangeset for help on using the changeset viewer.