Changeset 4091

Timestamp:

07/23/10 09:37:57 (14 years ago)

Author:

cneumuel

Message:

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

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive

Files:

• HeuristicLab.DataAccess.ADOHelper/3.3/DataAccessADOHelperPlugin.cs (modified) (1 diff)
• HeuristicLab.DataAccess/3.3/DataAccessPlugin.cs (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.SpringNET (copied) (copied from branches/3.2/sources/HeuristicLab.ExtLibs/HeuristicLab.SpringNET)
• HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0/HeuristicLab.SpringNET-1.3.0.csproj (modified) (9 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0/HeuristicLab.SpringNET-1.3.0.csproj.user (added)
• HeuristicLab.Hive 3.3.sln (modified) (4 diffs)
• HeuristicLab.Hive.Client.Communication/3.3/HeuristicLab.Hive.Client.Communication-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Communication/3.3/WcfService.cs (modified) (20 diffs)
• HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine/3.3/Executor.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/3.3/HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/HiveContractPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.3/HeuristicLab.Hive.Engine-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Hive.Engine/3.3/HeuristicLabHiveEnginePlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.3/HiveEngine.cs (modified) (9 diffs)
• HeuristicLab.Hive.Engine/3.3/HiveEngineEditor.Designer.cs (deleted)
• HeuristicLab.Hive.Engine/3.3/HiveEngineEditor.cs (deleted)
• HeuristicLab.Hive.Engine/3.3/HiveEngineEditor.resx (deleted)
• HeuristicLab.Hive.Engine/3.3/Job.cs (modified) (5 diffs)
• HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.3/Interfaces/IJob.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.3/JobBase.cs (modified) (3 diffs)
• HeuristicLab.Hive.JobBase/3.3/JobPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.3/TestJob.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs (modified) (18 diffs)
• HeuristicLab.Hive.Server.Core/3.3/DaoLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/DbTestApp.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/Facades (added)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs (added)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs (added)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs (added)
• HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Hive.Server.Core/3.3/HiveServerCorePlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.DataAccess/3.3/HiveServerDataAccessPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/LINQDataAccessPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Scheduler/3.3/HeuristicLab.Hive.Server.Scheduler-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Server.Scheduler/3.3/HiveServerSchedulerPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/3.3/HiveServerApplication.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/3.3/ServiceCallInterception.cs (modified) (3 diffs)
• HeuristicLab.Hive/3.3/Files.txt (modified) (1 diff)
• HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj.user (added)
• HeuristicLab.Hive/3.3/MergeConfigs.cmd (modified) (1 diff)
• HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive/3.3/app.config (added)
• HeuristicLab.Security.Contracts/3.3/SecurityContractsPlugin.cs (modified) (1 diff)
• HeuristicLab.Security.Core/3.3/HeuristicLab.Security.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Security.Core/3.3/SecurityCorePlugin.cs (modified) (1 diff)
• HeuristicLab.Security.DataAccess/3.3/SecurityDataAccessPlugin.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess.ADOHelper/3.3/DataAccessADOHelperPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataAccess.ADOHelper {
-  [Plugin("HeuristicLab.DataAccess.ADOHelper-3.3")]
+  [Plugin("HeuristicLab.DataAccess.ADOHelper", "3.3")]
   [PluginFile("HeuristicLab.DataAccess.ADOHelper-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
   public class DataAccessADOHelperPlugin : PluginBase {
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess/3.3/DataAccessPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataAccess {
-  [Plugin("HeuristicLab.DataAccess-3.3")]
+  [Plugin("HeuristicLab.DataAccess", "3.3")]
   [PluginFile("HeuristicLab.DataAccess-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
   public class DataAccessPlugin : PluginBase {
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0/HeuristicLab.SpringNET-1.3.0.csproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15 +15 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -25 +44 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33 +53 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
@@ -41 +62 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
@@ -49 +71 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -57 +80 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -65 +89 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -107 +135 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure</Name>
-    </ProjectReference>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -7 +7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive-3.3", "HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj", "{C92AAC8C-4D88-449C-ABA5-2B935D769842}"
+  ProjectSection(ProjectDependencies) = postProject
+    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84} = {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}
+    {21187322-52DD-4243-80A4-A85F0263E63B} = {21187322-52DD-4243-80A4-A85F0263E63B}
+    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F} = {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}
+    {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {D59E852C-F205-4647-8C05-EB9ED1CF44E9}
+    {CE2DFB48-6A9C-4507-96C6-5FC40E92035C} = {CE2DFB48-6A9C-4507-96C6-5FC40E92035C}
+    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B} = {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}
+    {679E977A-117B-456E-8594-2A4DEADB658B} = {679E977A-117B-456E-8594-2A4DEADB658B}
+    {9076697B-C151-46CD-95BC-1D059492B478} = {9076697B-C151-46CD-95BC-1D059492B478}
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1} = {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}
+    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} = {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}
+    {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {898B31CF-81DC-453B-AEB3-BDF83197A7EE}
+    {134F93D7-E7C8-4ECD-9923-7F63259A60D8} = {134F93D7-E7C8-4ECD-9923-7F63259A60D8}
+    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0} = {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}
+    {AC3D84FF-F0D7-43F0-9C99-9F8DBE087E2C} = {AC3D84FF-F0D7-43F0-9C99-9F8DBE087E2C}
+  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02A1B491-BFBA-407C-BE63-0227871E7B5C}"
@@ -52 +68 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.JobBase-3.3", "HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj", "{21187322-52DD-4243-80A4-A85F0263E63B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "Security", "{3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive.Client", "HeuristicLab.Hive.Client", "{DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive.Server", "HeuristicLab.Hive.Server", "{E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Security", "HeuristicLab.Security", "{3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive", "HeuristicLab.Hive", "{84899895-AC52-4053-8A91-61753EF8E0A8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab", "HeuristicLab", "{BD1DE6F6-A188-4D1F-9681-BA7104818370}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.ExtLibs", "HeuristicLab.ExtLibs", "{98B4B360-4F14-4BC5-92F2-9B81F6C712DA}"
+EndProject
+Project("{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}"
 EndProject
 Global
@@ -316 +340 @@
     {21187322-52DD-4243-80A4-A85F0263E63B}.Release|x86.ActiveCfg = Release|x86
     {21187322-52DD-4243-80A4-A85F0263E63B}.Release|x86.Build.0 = Release|x86
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x64.ActiveCfg = Debug|x64
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x64.Build.0 = Debug|x64
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x86.ActiveCfg = Debug|x86
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Debug|x86.Build.0 = Debug|x86
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|Any CPU.Build.0 = Release|Any CPU
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x64.ActiveCfg = Release|x64
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x64.Build.0 = Release|x64
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x86.ActiveCfg = Release|x86
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -321 +357 @@
   EndGlobalSection
   GlobalSection(NestedProjects) = preSolution
-    {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
-    {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
+    {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
+    {89F4BC52-C174-481E-9BD2-3814171020E8} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
     {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
-    {679E977A-117B-456E-8594-2A4DEADB658B} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
-    {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     {4D5A2A16-66C2-431D-9AA3-BD3041E64B84} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
     {A4499DDD-D1B8-414F-98F6-903C2C71BEB0} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
-    {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
-    {E3288D4B-7A51-499A-AC5B-019319CE51DC} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
+    {679E977A-117B-456E-8594-2A4DEADB658B} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
+    {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {E7D8EFDA-B0CB-4B62-8EAE-2CF473F14D74}
+    {134F93D7-E7C8-4ECD-9923-7F63259A60D8} = {84899895-AC52-4053-8A91-61753EF8E0A8}
+    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} = {84899895-AC52-4053-8A91-61753EF8E0A8}
+    {21187322-52DD-4243-80A4-A85F0263E63B} = {84899895-AC52-4053-8A91-61753EF8E0A8}
+    {C92AAC8C-4D88-449C-ABA5-2B935D769842} = {84899895-AC52-4053-8A91-61753EF8E0A8}
     {CE2DFB48-6A9C-4507-96C6-5FC40E92035C} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
     {AC3D84FF-F0D7-43F0-9C99-9F8DBE087E2C} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
+    {E3288D4B-7A51-499A-AC5B-019319CE51DC} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
+    {D59E852C-F205-4647-8C05-EB9ED1CF44E9} = {3721CE4A-1148-49E1-B8DD-D9F5309AB8D9}
+    {9076697B-C151-46CD-95BC-1D059492B478} = {BD1DE6F6-A188-4D1F-9681-BA7104818370}
+    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B} = {BD1DE6F6-A188-4D1F-9681-BA7104818370}
+    {48D4AEB1-2247-4B58-8B63-20B81BF8D4B1} = {98B4B360-4F14-4BC5-92F2-9B81F6C712DA}
   EndGlobalSection
 EndGlobal

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

@@ -76 +76 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <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

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts.Interfaces;
-using HeuristicLab.Hive.Contracts;
-using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Client.Common;
-using HeuristicLab.Hive.Client.Communication.ServerService;
 using HeuristicLab.PluginInfrastructure;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
 
 namespace HeuristicLab.Hive.Client.Communication {
+  using Service = HeuristicLab.Hive.Client.Communication.ServerService;
+
   /// <summary>
   /// WcfService class is implemented as a Singleton and works as a communication Layer with the Server
@@ -64 +65 @@
     public event EventHandler Connected;    
 
-    public ClientFacadeClient proxy = null;
+    public Service.ClientFacadeClient proxy = null;
 
     /// <summary>
@@ -85 +86 @@
 
         Logger.Debug("Creating the new connection proxy");
-        proxy = new ClientFacadeClient(
-          WcfSettings.GetStreamedBinding(),
+        proxy = new HeuristicLab.Hive.Client.Communication.ServerService.ClientFacadeClient(
+          HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
           new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator")
         );
@@ -92 +93 @@
 
         Logger.Debug("Registring new Events");
-        proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
-        proxy.SendStreamedJobCompleted += new EventHandler<SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
-        proxy.StoreFinishedJobResultStreamedCompleted += new EventHandler<StoreFinishedJobResultStreamedCompletedEventArgs>(proxy_StoreFinishedJobResultStreamedCompleted);
-        proxy.ProcessSnapshotStreamedCompleted += new EventHandler<ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
-        proxy.ProcessHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(proxy_ProcessHeartBeatCompleted);
+        proxy.LoginCompleted += new EventHandler<Service.LoginCompletedEventArgs>(proxy_LoginCompleted);
+        proxy.SendStreamedJobCompleted += new EventHandler<Service.SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
+        proxy.StoreFinishedJobResultStreamedCompleted += new EventHandler<Service.StoreFinishedJobResultStreamedCompletedEventArgs>(proxy_StoreFinishedJobResultStreamedCompleted);
+        proxy.ProcessSnapshotStreamedCompleted += new EventHandler<Service.ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
+        proxy.ProcessHeartBeatCompleted += new EventHandler<Service.ProcessHeartBeatCompletedEventArgs>(proxy_ProcessHeartBeatCompleted);
         Logger.Debug("Registered new Events");
         Logger.Debug("Opening the Connection");
@@ -164 +165 @@
     /// </summary>
     #region Login
-    public event System.EventHandler<LoginCompletedEventArgs> LoginCompleted;
+    public event System.EventHandler<Service.LoginCompletedEventArgs> LoginCompleted;
     public void LoginAsync(ClientDto clientInfo) {
       if (ConnState == NetworkEnum.WcfConnState.Connected) {
@@ -171 +172 @@
       }
     }
-    private void proxy_LoginCompleted(object sender, LoginCompletedEventArgs e) {
+    private void proxy_LoginCompleted(object sender, Service.LoginCompletedEventArgs e) {
       if (e.Error == null) {
         Logger.Debug("ENDED: Login Async");
@@ -183 +184 @@
         if (ConnState == NetworkEnum.WcfConnState.Connected) {
           Logger.Debug("STARTED: Login Sync");
-          Response res = proxy.Login(clientInfo);
+          HeuristicLab.Hive.Contracts.Response res = proxy.Login(clientInfo);
           if (!res.Success) {
             Logger.Error("FAILED: Login Failed! " + res.StatusMessage);
@@ -204 +205 @@
     /// </summary>
     #region PullJob
-    public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
+    public event System.EventHandler<Service.SendJobCompletedEventArgs> SendJobCompleted;
     public void SendJobAsync(Guid guid) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
@@ -212 +213 @@
     }
 
-    void proxy_SendStreamedJobCompleted(object sender, SendStreamedJobCompletedEventArgs e) {
+    void proxy_SendStreamedJobCompleted(object sender, Service.SendStreamedJobCompletedEventArgs e) {
       if (e.Error == null) {
         Logger.Debug("ENDED: Fetching of Jobs from Server for Client");
@@ -238 +239 @@
           memStream.Close();
 
-          SendJobCompletedEventArgs completedEventArgs =
-            new SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
+          Service.SendJobCompletedEventArgs completedEventArgs =
+            new Service.SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
           SendJobCompleted(sender, completedEventArgs);
         } catch (Exception ex) {
@@ -260 +261 @@
     /// </summary>
     #region SendJobResults
-    public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
+    public event System.EventHandler<Service.StoreFinishedJobResultCompletedEventArgs> StoreFinishedJobResultCompleted;
     public void StoreFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
@@ -272 +273 @@
       }
      }
-    private void proxy_StoreFinishedJobResultStreamedCompleted(object sender, StoreFinishedJobResultStreamedCompletedEventArgs e) {
+    private void proxy_StoreFinishedJobResultStreamedCompleted(object sender, Service.StoreFinishedJobResultStreamedCompletedEventArgs e) {
       Logger.Debug("Finished storing the job");
       Stream stream =
@@ -281 +282 @@
       }
       if (e.Error == null) {
-        StoreFinishedJobResultCompletedEventArgs args =
-          new StoreFinishedJobResultCompletedEventArgs(
+        Service.StoreFinishedJobResultCompletedEventArgs args =
+          new Service.StoreFinishedJobResultCompletedEventArgs(
             new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
         Logger.Debug("calling the Finished Job Event");
@@ -294 +295 @@
 
     #region Processsnapshots
-    public event System.EventHandler<ProcessSnapshotCompletedEventArgs> ProcessSnapshotCompleted;
+    public event System.EventHandler<Service.ProcessSnapshotCompletedEventArgs> ProcessSnapshotCompleted;
     public void ProcessSnapshotAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
@@ -303 +304 @@
       }
     }
-    void proxy_ProcessSnapshotStreamedCompleted(object sender, ProcessSnapshotStreamedCompletedEventArgs e) {
+    void proxy_ProcessSnapshotStreamedCompleted(object sender, Service.ProcessSnapshotStreamedCompletedEventArgs e) {
       Stream stream =
         (Stream)e.UserState;
@@ -310 +311 @@
       
       if (e.Error == null) {
-        ProcessSnapshotCompletedEventArgs args =
-          new ProcessSnapshotCompletedEventArgs(
+        Service.ProcessSnapshotCompletedEventArgs args =
+          new Service.ProcessSnapshotCompletedEventArgs(
             new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
 
@@ -326 +327 @@
     #region Heartbeat
 
-    public event System.EventHandler<ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
+    public event System.EventHandler<Service.ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
     public void ProcessHeartBeatAsync(HeartBeatData hbd) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin)
@@ -333 +334 @@
     }
 
-    private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
+    private void proxy_ProcessHeartBeatCompleted(object sender, Service.ProcessHeartBeatCompletedEventArgs e) {
       if (e.Error == null && e.Result.Success) {
         ProcessHeartBeatCompleted(sender, e);
@@ -406 +407 @@
     }
 
-    public List<CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
+    public List<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
       try {
         Logger.Debug("STARTED: Requesting Plugins for Job");
@@ -451 +452 @@
     }
 
-    public Response SetCalendarStatus (Guid clientId, CalendarState state) {
+    public Response SetCalendarStatus(Guid clientId, CalendarState state) {
       try {
         Logger.Debug("STARTED: Setting Calendar status to: " + state);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs

@@ -57 +57 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4077")]
-[assembly: AssemblyFileVersion("3.3.0.4077")]
-[assembly: AssemblyBuildDate("2010/07/22 13:53:38")]
+[assembly: AssemblyVersion("3.3.0.4078")]
+[assembly: AssemblyFileVersion("3.3.0.4078")]
+[assembly: AssemblyBuildDate("2010/07/22 16:16:39")]

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

@@ -24 +24 @@
 using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Hive.JobBase;
+using HeuristicLab.Persistence.Core;
 
 namespace HeuristicLab.Hive.Client.ExecutionEngine {
@@ -50 +51 @@
     public void Start(byte[] serializedJob) {
       CreationTime = DateTime.Now;
-      Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
+      throw new NotImplementedException("TODO[chn] use persistency-3.3");
+      // Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
+      
       //debug
-      //Job = new TestJob();
+      Job = new TestJob();
+
       Job.JobStopped += new EventHandler(Job_JobStopped);
       Job.JobFailed += new EventHandler(Job_JobFailed);
@@ -114 +118 @@
 
     private byte[] SerializeJobObject() {
-      return PersistenceManager.SaveToGZip(Job);
+      throw new NotImplementedException("TODO[chn] use persistency-3.3");
+      return null; // PersistenceManager.SaveToGZip(Job);
     }
 
     private void RestoreJobObject(byte[] sjob) {
-      Job = (IJob)PersistenceManager.RestoreFromGZip(sjob);
+      throw new NotImplementedException("TODO[chn] use persistency-3.3");
+      //Job = (IJob)PersistenceManager.RestoreFromGZip(sjob);
     }
 

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

@@ -76 +76 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <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

@@ -26 +26 @@
 
 namespace HeuristicLab.Hive.Server {
-  [Plugin("HeuristicLab.Hive.Contracts-3.3")]
+  [Plugin("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginFile("HeuristicLab.Hive.Contracts-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
-  [PluginDependency("HeuristicLab.DataAccess-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
   public class HiveServerContracts : PluginBase {
   }

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

@@ -103 +103 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.SequentialEngine-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Tracing-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -125 +131 @@
     <Compile Include="HeuristicLabHiveEnginePlugin.cs" />
     <Compile Include="HiveEngine.cs" />
-    <Compile Include="HiveEngineEditor.cs" />
-    <Compile Include="HiveEngineEditor.Designer.cs">
-      <DependentUpon>HiveEngineEditor.cs</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceLocator.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
+      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
+      <Name>HeuristicLab.DataAccess-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
@@ -145 +151 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="HiveEngineEditor.resx">
-      <DependentUpon>HiveEngineEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLabHiveEnginePlugin.cs

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Hive.Engine plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Hive.Engine-3.3")]
+  [Plugin("HeuristicLab.Hive.Engine", "3.3")]
   [PluginFile("HeuristicLab.Hive.Engine-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Common","3.3.0.0")]
-  [PluginDependency("HeuristicLab.Core-3.3")]
-  [PluginDependency("HeuristicLab.Data-3.3")]
-  [PluginDependency("HeuristicLab.DataAccess-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
-  [PluginDependency("HeuristicLab.Hive.JobBase-3.3")]
-  [PluginDependency("HeuristicLab.SequentialEngine-3.3")]
-  [PluginDependency("HeuristicLab.Tracing","3.3.0.0")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
+  [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
+  [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class HeuristicLabHiveEnginePlugin : PluginBase {
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HiveEngine.cs

@@ -41 +41 @@
   /// in parallel.
   /// </summary>
-  public class HiveEngine : ItemBase, IEngine, IEditable {
+  public class HiveEngine : HeuristicLab.Core.Engine {
     private const int SNAPSHOT_POLLING_INTERVAL_MS = 1000;
     private const int RESULT_POLLING_INTERVAL_MS = 10000;
@@ -60 +60 @@
     }
 
-    #region IEngine Members
-
-    public IOperatorGraph OperatorGraph {
-      get { return job.Engine.OperatorGraph; }
-    }
-
-    public IScope GlobalScope {
-      get { return job.Engine.GlobalScope; }
-    }
+    //public OperatorGraph OperatorGraph {
+    //  get { return job.Engine.OperatorGraph; }
+    //}
+
+    //public IScope GlobalScope {
+    //  get { return job.Engine.GlobalScope; }
+    //}
 
     public TimeSpan ExecutionTime {
@@ -75 +73 @@
 
     public ThreadPriority Priority {
-      get { return job.Engine.Priority; }
-      set { job.Engine.Priority = value; }
-    }
-
-    public bool Running {
-      get { return job.Engine.Running; }
-    }
-
-    public bool Canceled {
-      get { return job.Engine.Canceled; }
-    }
-
-    public bool Terminated {
-      get { return job.Engine.Terminated; }
-    }
-
-    public void Execute() {
+      get { return this.Priority; }
+      set { this.Priority = value; }
+    }
+
+    //public bool Running {
+    //  get { return job.Engine.ExecutionState == Core.ExecutionState.Started; }
+    //}
+
+    //public bool Canceled {
+    //  get { return job.Engine.Canceled; }
+    //}
+
+    //public bool Terminated {
+    //  get { return job.Engine.Terminated; }
+    //}
+
+    public ExecutionState ExecutionState {
+      get { return job.Engine.ExecutionState; }
+    }
+
+    protected override void ProcessNextOperation() {
       var jobObj = CreateJobObj();
       IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
@@ -97 +99 @@
       List<string> groups = new List<string>();
       if (!String.Empty.Equals(RessourceIds)) {
-        groups.AddRange(RessourceIds.Split(';'));        
+        groups.AddRange(RessourceIds.Split(';'));
       }
 
@@ -110 +112 @@
           }   
         }
-      } */     
+      } */
 
       int loops = 1;
-      
+
       Int32.TryParse(MultiSubmitCount, out loops);
-      if(loops == 0)
+      if (loops == 0)
         loops = 1;
 
@@ -122 +124 @@
         jobId = res.Obj.Id;
       }
-      
+
       StartResultPollingThread();
     }
@@ -144 +146 @@
             // 4. the result that we get from the server is a snapshot and not the final result
             if (abortRequested) return;
-              if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
+            if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
               Logger.Debug("HiveEngine: Results-polling - Got result!");
-              restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
+              throw new NotImplementedException("TODO[chn]use persistency-3.3");
+              //restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
               Logger.Debug("HiveEngine: Results-polling - IsSnapshotResult: " + (restoredJob.Progress < 1.0));
             }
@@ -153 +156 @@
 
         job = restoredJob;
-        ControlManager.Manager.ShowControl(job.Engine.CreateView());
-        OnChanged();
-        OnFinished();
+
+        //ControlManager.Manager.ShowControl(job.Engine.CreateView());
+        //OnChanged();
+
+        //OnFinished();
       });
       Logger.Debug("HiveEngine: Starting results-polling thread");
@@ -161 +166 @@
     }
 
-    public void RequestSnapshot() {
-      IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
-      int retryCount = 0;
-      ResponseObject<SerializedJob> response;
-      lock (locker) {
-        Logger.Debug("HiveEngine: Abort - RequestSnapshot");
-        Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
-        if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
-          // job is finished already
-          Logger.Debug("HiveEngine: Abort - GetLastResult(false)");
-          response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
-          Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
-        } else {
-          // server sent snapshot request to client
-          // poll until snapshot is ready
-          do {
-            Thread.Sleep(SNAPSHOT_POLLING_INTERVAL_MS);
-            Logger.Debug("HiveEngine: Abort - GetLastResult(true)");
-            response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
-            Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
-            retryCount++;
-            // loop while
-            // 1. problem with communication with server
-            // 2. job result not yet ready
-          } while (
-            (retryCount < MAX_SNAPSHOT_RETRIES) && (
-            !response.Success ||
-            response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
-            );
-        }
-      }
-      SerializedJob jobResult = response.Obj;
-      if (jobResult != null) {
-        Logger.Debug("HiveEngine: Results-polling - Got result!");
-        job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobData);
-        ControlManager.Manager.ShowControl(job.Engine.CreateView());
-      }
-      //HiveLogger.Debug("HiveEngine: Results-polling - Exception!");
-      //Exception ex = new Exception(response.Obj.Exception.Message);
-      //ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
-    }
-
-    public void ExecuteStep() {
-      throw new NotSupportedException();
-    }
-
-    public void ExecuteSteps(int steps) {
-      throw new NotSupportedException();
-    }
-
-    public void Abort() {
-      abortRequested = true;
-      // RequestSnapshot();
-      IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
-      executionEngineFacade.AbortJob(jobId);
-      OnChanged();
-      OnFinished();
-    }
-
-    public void Reset() {
-      abortRequested = false;
-      job.Engine.Reset();
-      jobId = Guid.NewGuid();
-      OnInitialized();
-    }
-
     private HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob CreateJobObj() {
       HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj =
         new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
 
-      MemoryStream memStream = new MemoryStream();
-      GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
-      XmlDocument document = PersistenceManager.CreateXmlDocument();
-      Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
-      XmlNode rootNode = document.CreateElement("Root");
-      document.AppendChild(rootNode);
-      rootNode.AppendChild(PersistenceManager.Persist(job, document, dictionary));
-      document.Save(stream);
-      stream.Close();
-
-      HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob executableJobObj =
-        new HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob();
-      executableJobObj.JobInfo = jobObj;
-      executableJobObj.SerializedJobData = memStream.ToArray();
-
-      List<IPluginDescription> plugins = new List<IPluginDescription>();
-
-      foreach (IStorable storeable in dictionary.Values) {
-        IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
-        if (!plugins.Contains(pluginInfo)) {
-          plugins.Add(pluginInfo);
-          foreach (var dependency in pluginInfo.Dependencies) {
-            if (!plugins.Contains(dependency)) plugins.Add(dependency);
-          }
-        }
-      }
-
-      List<HivePluginInfoDto> pluginsNeeded =
-        new List<HivePluginInfoDto>();
-      foreach (IPluginDescription uniquePlugin in plugins) {
-        HivePluginInfoDto pluginInfo =
-          new HivePluginInfoDto();
-        pluginInfo.Name = uniquePlugin.Name;
-        pluginInfo.Version = uniquePlugin.Version;
-        pluginInfo.BuildDate = uniquePlugin.BuildDate;
-        pluginsNeeded.Add(pluginInfo);
-      }
-
-      jobObj.CoresNeeded = 1;
-      jobObj.PluginsNeeded = pluginsNeeded;
-      jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
-      return executableJobObj;
-    }
-
-    public event EventHandler Initialized;
-    /// <summary>
-    /// Fires a new <c>Initialized</c> event.
-    /// </summary>
-    protected virtual void OnInitialized() {
-      if (Initialized != null)
-        Initialized(this, new EventArgs());
-    }
-
-    public event EventHandler<EventArgs<IOperation>> OperationExecuted;
-    /// <summary>
-    /// Fires a new <c>OperationExecuted</c> event.
-    /// </summary>
-    /// <param name="operation">The operation that has been executed.</param>
-    protected virtual void OnOperationExecuted(IOperation operation) {
-      if (OperationExecuted != null)
-        OperationExecuted(this, new EventArgs<IOperation>(operation));
-    }
-
-    public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
-    /// <summary>
-    /// Aborts the execution and fires a new <c>ExceptionOccurred</c> event.
-    /// </summary>
-    /// <param name="exception">The exception that was thrown.</param>
-    protected virtual void OnExceptionOccurred(Exception exception) {
-      Abort();
-      if (ExceptionOccurred != null)
-        ExceptionOccurred(this, new EventArgs<Exception>(exception));
-    }
-
-    public event EventHandler ExecutionTimeChanged;
-    /// <summary>
-    /// Fires a new <c>ExecutionTimeChanged</c> event.
-    /// </summary>
-    protected virtual void OnExecutionTimeChanged() {
-      if (ExecutionTimeChanged != null)
-        ExecutionTimeChanged(this, new EventArgs());
-    }
-
-    public event EventHandler Finished;
-    /// <summary>
-    /// Fires a new <c>Finished</c> event.
-    /// </summary>
-    protected virtual void OnFinished() {
-      if (Finished != null)
-        Finished(this, new EventArgs());
-    }
-
-    #endregion
-
-    public override IView CreateView() {
-      return new HiveEngineEditor(this);
-    }
-
-    #region IEditable Members
-
-    public IEditor CreateEditor() {
-      return new HiveEngineEditor(this);
-    }
-    #endregion
-
-    public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      XmlAttribute attr = document.CreateAttribute("HiveServerUrl");
-      attr.Value = HiveServerUrl;
-      node.Attributes.Append(attr);
-      node.AppendChild(PersistenceManager.Persist("Job", job, document, persistedObjects));
-      return node;
-    }
-
-    public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      HiveServerUrl = node.Attributes["HiveServerUrl"].Value;
-      job = (Job)PersistenceManager.Restore(node.SelectSingleNode("Job"), restoredObjects);
-    }
+
+      throw new NotImplementedException("TODO[chn]use persistency-3.3");
+
+      //MemoryStream memStream = new MemoryStream();
+      //GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
+      //XmlDocument document = PersistenceManager.CreateXmlDocument();
+      //Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
+      //XmlNode rootNode = document.CreateElement("Root");
+      //document.AppendChild(rootNode);
+      //rootNode.AppendChild(PersistenceManager.Persist(job, document, dictionary));
+      //document.Save(stream);
+      //stream.Close();
+
+      //HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob executableJobObj =
+      //  new HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob();
+      //executableJobObj.JobInfo = jobObj;
+      //executableJobObj.SerializedJobData = memStream.ToArray();
+
+      //List<IPluginDescription> plugins = new List<IPluginDescription>();
+
+      //foreach (IStorable storeable in dictionary.Values) {
+      //  IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
+      //  if (!plugins.Contains(pluginInfo)) {
+      //    plugins.Add(pluginInfo);
+      //    foreach (var dependency in pluginInfo.Dependencies) {
+      //      if (!plugins.Contains(dependency)) plugins.Add(dependency);
+      //    }
+      //  }
+      //}
+
+      //List<HivePluginInfoDto> pluginsNeeded =
+      //  new List<HivePluginInfoDto>();
+      //foreach (IPluginDescription uniquePlugin in plugins) {
+      //  HivePluginInfoDto pluginInfo =
+      //    new HivePluginInfoDto();
+      //  pluginInfo.Name = uniquePlugin.Name;
+      //  pluginInfo.Version = uniquePlugin.Version;
+      //  pluginInfo.BuildDate = uniquePlugin.BuildDate;
+      //  pluginsNeeded.Add(pluginInfo);
+      //}
+
+      //jobObj.CoresNeeded = 1;
+      //jobObj.PluginsNeeded = pluginsNeeded;
+      //jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
+      //return executableJobObj;
+    }
+
+    //public event EventHandler Initialized;
+    ///// <summary>
+    ///// Fires a new <c>Initialized</c> event.
+    ///// </summary>
+    //protected virtual void OnInitialized() {
+    //  if (Initialized != null)
+    //    Initialized(this, new EventArgs());
+    //}
+
+    //public event EventHandler<EventArgs<IOperation>> OperationExecuted;
+    ///// <summary>
+    ///// Fires a new <c>OperationExecuted</c> event.
+    ///// </summary>
+    ///// <param name="operation">The operation that has been executed.</param>
+    //protected virtual void OnOperationExecuted(IOperation operation) {
+    //  if (OperationExecuted != null)
+    //    OperationExecuted(this, new EventArgs<IOperation>(operation));
+    //}
+
+    //public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
+    ///// <summary>
+    ///// Aborts the execution and fires a new <c>ExceptionOccurred</c> event.
+    ///// </summary>
+    ///// <param name="exception">The exception that was thrown.</param>
+    //protected virtual void OnExceptionOccurred(Exception exception) {
+    //  Abort();
+    //  if (ExceptionOccurred != null)
+    //    ExceptionOccurred(this, new EventArgs<Exception>(exception));
+    //}
+
+    //public event EventHandler ExecutionTimeChanged;
+    ///// <summary>
+    ///// Fires a new <c>ExecutionTimeChanged</c> event.
+    ///// </summary>
+    //protected virtual void OnExecutionTimeChanged() {
+    //  if (ExecutionTimeChanged != null)
+    //    ExecutionTimeChanged(this, new EventArgs());
+    //}
+
+    //public event EventHandler Finished;
+    ///// <summary>
+    ///// Fires a new <c>Finished</c> event.
+    ///// </summary>
+    //protected virtual void OnFinished() {
+    //  if (Finished != null)
+    //    Finished(this, new EventArgs());
+    //}
+
+    //public void Abort() {
+    //  abortRequested = true;
+    //  // RequestSnapshot();
+    //  IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
+    //  executionEngineFacade.AbortJob(jobId);
+    //  //OnChanged();
+    //  OnFinished();
+    //}
+
+    //public void Reset() {
+    //  abortRequested = false;
+
+    //  throw new NotImplementedException("[chn] how to reset Engine?");
+    //  //job.Engine.Reset();
+
+    //  jobId = Guid.NewGuid();
+    //  OnInitialized();
+    //}
+
+    //public void RequestSnapshot() {
+    //  IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
+    //  int retryCount = 0;
+    //  ResponseObject<SerializedJob> response;
+    //  lock (locker) {
+    //    Logger.Debug("HiveEngine: Abort - RequestSnapshot");
+    //    Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
+    //    if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
+    //      // job is finished already
+    //      Logger.Debug("HiveEngine: Abort - GetLastResult(false)");
+    //      response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
+    //      Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+    //    } else {
+    //      // server sent snapshot request to client
+    //      // poll until snapshot is ready
+    //      do {
+    //        Thread.Sleep(SNAPSHOT_POLLING_INTERVAL_MS);
+    //        Logger.Debug("HiveEngine: Abort - GetLastResult(true)");
+    //        response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
+    //        Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+    //        retryCount++;
+    //        // loop while
+    //        // 1. problem with communication with server
+    //        // 2. job result not yet ready
+    //      } while (
+    //        (retryCount < MAX_SNAPSHOT_RETRIES) && (
+    //        !response.Success ||
+    //        response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
+    //        );
+    //    }
+    //  }
+    //  SerializedJob jobResult = response.Obj;
+    //  if (jobResult != null) {
+    //    Logger.Debug("HiveEngine: Results-polling - Got result!");
+
+    //    //job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobData);
+    //    //ControlManager.Manager.ShowControl(job.Engine.CreateView());
+    //    throw new NotImplementedException("TODO[chn]use persistency-3.3");
+    //  }
+    //  //HiveLogger.Debug("HiveEngine: Results-polling - Exception!");
+    //  //Exception ex = new Exception(response.Obj.Exception.Message);
+    //  //ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
+    //}
+
+    //public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+    //  XmlAttribute attr = document.CreateAttribute("HiveServerUrl");
+    //  attr.Value = HiveServerUrl;
+    //  node.Attributes.Append(attr);
+    //  node.AppendChild(PersistenceManager.Persist("Job", job, document, persistedObjects));
+    //  return node;
+    //}
+
+    //public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  HiveServerUrl = node.Attributes["HiveServerUrl"].Value;
+    //  job = (Job)PersistenceManager.Restore(node.SelectSingleNode("Job"), restoredObjects);
+    //}
+
+
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/Job.cs

@@ -32 +32 @@
 namespace HeuristicLab.Hive.Engine {
   /// <summary>
-  /// Represents an job that wraps an engine that should be executed in the hive.
+  /// Represents a job that wraps an engine that should be executed in the hive.
   /// </summary>
-  public class Job : StorableBase, IJob {
+  public class Job : IJob {
     private IEngine engine;
     public IEngine Engine {
@@ -42 +42 @@
     public Job()
       : base() {
+      
       engine = new SequentialEngine.SequentialEngine();
-      engine.Priority = ThreadPriority.Lowest;
+      //engine.Priority = ThreadPriority.Lowest;
       RegisterEvents();
     }
 
     private void RegisterEvents() {
-      engine.Finished += new EventHandler(engine_Finished);
+      engine.Stopped += new EventHandler(engine_Stopped);
       engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
     }
 
     private void DeregisterEvents() {
-      engine.Finished -= new EventHandler(engine_Finished);
+      engine.Stopped -= new EventHandler(engine_Stopped);
       engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
     }
 
-    void engine_Finished(object sender, EventArgs e) {
-      if (Engine.Canceled) this.progress = 0.0;
+    void engine_Stopped(object sender, EventArgs e) {
+      if (Engine.ExecutionState != ExecutionState.Stopped) this.progress = 0.0;
       else this.progress = 1.0;
       var listeners = JobStopped;
@@ -86 +87 @@
     public double Progress {
       get {
-        DoubleData progress = Engine.GlobalScope.GetVariableValue<DoubleData>("Progress", false,
-          false);
-        return progress == null ? this.progress : progress.Data;
+        //DoubleValue progress = Engine.GlobalScope.GetVariableValue<DoubleData>("Progress", false, false); [chn] not possible in 3.3?
+
+        return engine.ExecutionState == ExecutionState.Stopped ? 1.0 : 0.0;
       }
       set { throw new NotSupportedException(); }
@@ -95 +96 @@
     public bool Running {
       get {
-        return Engine.Running;
+        return Engine.ExecutionState == ExecutionState.Started;
       }
       set {
@@ -107 +108 @@
 
     public void Start() {
-      Engine.Execute();
+      Engine.Start();
     }
 
     public void Stop() {
-      Engine.Abort();
+      Engine.Stop();
     }
 
     #endregion
 
-    public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      XmlAttribute idAttr = document.CreateAttribute("JobId");
-      idAttr.Value = XmlConvert.ToString(JobId);
-      XmlAttribute progressAttr = document.CreateAttribute("Progress");
-      progressAttr.Value = XmlConvert.ToString(progress);
-      node.Attributes.Append(idAttr);
-      node.Attributes.Append(progressAttr);
-      node.AppendChild(PersistenceManager.Persist("Engine", Engine, document, persistedObjects));
-      return node;
-    }
-    public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      JobId = XmlConvert.ToInt64(node.Attributes["JobId"].Value);
-      progress = XmlConvert.ToDouble(node.Attributes["Progress"].Value);
-      DeregisterEvents();
-      engine = (SequentialEngine.SequentialEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
-      RegisterEvents();
-    }
+    //public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+    //  XmlAttribute idAttr = document.CreateAttribute("JobId");
+    //  idAttr.Value = XmlConvert.ToString(JobId);
+    //  XmlAttribute progressAttr = document.CreateAttribute("Progress");
+    //  progressAttr.Value = XmlConvert.ToString(progress);
+    //  node.Attributes.Append(idAttr);
+    //  node.Attributes.Append(progressAttr);
+    //  node.AppendChild(PersistenceManager.Persist("Engine", Engine, document, persistedObjects));
+    //  return node;
+    //}
+    //public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  JobId = XmlConvert.ToInt64(node.Attributes["JobId"].Value);
+    //  progress = XmlConvert.ToDouble(node.Attributes["Progress"].Value);
+    //  DeregisterEvents();
+    //  engine = (SequentialEngine.SequentialEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
+    //  RegisterEvents();
+    //}
   }
 }

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

@@ -94 +94 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <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

@@ -1 +1 @@
 using System;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
 namespace HeuristicLab.Hive.JobBase {
-  public interface IJob: IStorable {
+  public interface IJob {
+    long JobId { get; set; }
+    bool Running { get; set; }
+    double Progress { get; }
+    void Run();
+    void Start();
+    void Stop();
+
     event EventHandler JobStopped;
     event EventHandler JobFailed;
-    long JobId { get; set; }
-    double Progress { get; }
-    void Run();
-    bool Running { get; set; }
-    void Start();
-    void Stop();
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobBase.cs

@@ -27 +27 @@
 using System.Xml;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Hive.JobBase {
   [Serializable]
-  abstract public class JobBase : StorableBase, IJob {
+  [StorableClass]
+  abstract public class JobBase : IJob {
 
     private Thread thread = null;
@@ -36 +38 @@
     public event EventHandler JobFailed;
     
-    public long JobId { get; set; }    
-    public double Progress { get; set; }        
+    [Storable]
+    public long JobId { get; set; }
+
+    [Storable]
+    public double Progress { get; set; }
+
+    [Storable]
     public bool Running { get; set; }
-    
+
+    [Storable]
     protected bool abort = false;    
 
@@ -70 +78 @@
     }
 
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+    //public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
 
-      XmlNode progr = document.CreateNode(XmlNodeType.Element, "Progress", null);
-      progr.InnerText = Convert.ToString(Progress);
+    //  XmlNode progr = document.CreateNode(XmlNodeType.Element, "Progress", null);
+    //  progr.InnerText = Convert.ToString(Progress);
 
-      node.AppendChild(progr);
-      return node;
-    }
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
+    //  node.AppendChild(progr);
+    //  return node;
+    //}
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
 
-      XmlNode progr = node.SelectSingleNode("Progress");
-      Progress = Convert.ToDouble(progr.InnerText);
-    }
+    //  XmlNode progr = node.SelectSingleNode("Progress");
+    //  Progress = Convert.ToDouble(progr.InnerText);
+    //}
 
     public JobBase() {    

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobPlugin.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.Hive.JobBase {
-  [Plugin("HeuristicLab.Hive.JobBase-3.3")]
+  [Plugin("HeuristicLab.Hive.JobBase", "3.3")]
   [PluginFile("HeuristicLab.Hive.JobBase-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class JobBasePlugin: PluginBase {
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/TestJob.cs

@@ -29 +29 @@
 using System.IO;
 using System.Security.Permissions;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Hive.JobBase {
   [Serializable]
+  [StorableClass]
   public class TestJob: JobBase {
 
+    [Storable]
     private int runValue = 0;
+
+    public TestJob() {
+    }
 
     public override void Run() {
@@ -52 +58 @@
       OnJobStopped();
     }
-    public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, HeuristicLab.Core.IStorable> persistedObjects) {      
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+
+    //public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, HeuristicLab.Core.IStorable> persistedObjects) {      
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
     
-      XmlNode startValue = document.CreateNode(XmlNodeType.Element, "StartValue", null);
-      startValue.InnerText = Convert.ToString(runValue);
+    //  XmlNode startValue = document.CreateNode(XmlNodeType.Element, "StartValue", null);
+    //  startValue.InnerText = Convert.ToString(runValue);
       
-      node.AppendChild(startValue);
-      return node;
-    }
+    //  node.AppendChild(startValue);
+    //  return node;
+    //}
 
-    public override void Populate(XmlNode node, IDictionary<Guid, HeuristicLab.Core.IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
+    //public override void Populate(XmlNode node, IDictionary<Guid, HeuristicLab.Core.IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
 
-      XmlNode startValue = node.SelectSingleNode("StartValue");
-      runValue = Convert.ToInt32(startValue.InnerText);
-    }
-
-    public TestJob() {
-    }
-
-
+    //  XmlNode startValue = node.SelectSingleNode("StartValue");
+    //  runValue = Convert.ToInt32(startValue.InnerText);
+    //}
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Text;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Threading;
+using System.Transactions;
+using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts.Interfaces;
-using HeuristicLab.Hive.Contracts;
-using HeuristicLab.Core;
-using HeuristicLab.Hive.Server.DataAccess;
-using System.Resources;
-using System.Reflection;
-using HeuristicLab.Hive.JobBase;
 using HeuristicLab.Hive.Server.Core.InternalInterfaces;
-using System.Threading;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.DataAccess.Interfaces;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
 using HeuristicLab.Tracing;
-using Linq = HeuristicLab.Hive.Server.LINQDataAccess;
-using System.Transactions;
-using HeuristicLab.Hive.Server.LINQDataAccess;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -75 +66 @@
 
       lifecycleManager = ServiceLocator.GetLifecycleManager();
-      jobManager = ServiceLocator.GetJobManager() as
-        IInternalJobManager;
+      jobManager = ServiceLocator.GetJobManager() as IInternalJobManager;
       scheduler = ServiceLocator.GetScheduler();
 
-      lifecycleManager.RegisterHeartbeat(
-        new EventHandler(lifecycleManager_OnServerHeartbeat));
+      lifecycleManager.RegisterHeartbeat(new EventHandler(lifecycleManager_OnServerHeartbeat));
     }
 
@@ -109 +98 @@
               foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
                 //maybe implementa n additional Watchdog? Till then, just set them offline..
-                DaoLocator.JobDao.SetJobOffline(job);                                
+                DaoLocator.JobDao.SetJobOffline(job);
               }
             } else {
@@ -168 +157 @@
             if (pendingJobs[currJob.Id] <= 0) {
               currJob.State = State.offline;
-              DaoLocator.JobDao.Update(currJob);              
+              DaoLocator.JobDao.Update(currJob);
             } else {
               pendingJobs[currJob.Id]--;
@@ -216 +205 @@
 
       ClientDto client = DaoLocator.ClientDao.FindById(clientId);
-      if(client == null) {
+      if (client == null) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
         return response;
       }
-      
+
       response.ForceFetch = (client.CalendarSyncStatus == CalendarState.ForceFetch);
-      
+
       IEnumerable<AppointmentDto> appointments = DaoLocator.UptimeCalendarDao.GetCalendarForClient(client);
       if (appointments.Count() == 0) {
@@ -239 +228 @@
 
     public Response SetCalendarStatus(Guid clientId, CalendarState state) {
-      Response response = new Response();      
+      Response response = new Response();
       ClientDto client = DaoLocator.ClientDao.FindById(clientId);
       if (client == null) {
@@ -246 +235 @@
         return response;
       }
-      
+
       client.CalendarSyncStatus = state;
       DaoLocator.ClientDao.Update(client);
-      
+
       response.Success = true;
       response.StatusMessage = ApplicationConstants.RESPONSE_UPTIMECALENDAR_STATUS_UPDATED;
-      
+
       return response;
     }
@@ -298 +287 @@
 
       Logger.Debug("BEGIN Processing Heartbeat Jobs");
-      processJobProcess(hbData, response);
+      ProcessJobProcess(hbData, response);
       Logger.Debug("END Processed Heartbeat Jobs");
 
@@ -306 +295 @@
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR;
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchOrForceFetchCalendar));
-        
+
         //client.CalendarSyncStatus = CalendarState.Fetching;
-        
-        Logger.Info("fetch or forcefetch sent");        
+
+        Logger.Info("fetch or forcefetch sent");
       }
 
@@ -338 +327 @@
     /// <param name="clientAdapter"></param>
     /// <param name="response"></param>
-    private void processJobProcess(HeartBeatData hbData, ResponseHB response) {
+    private void ProcessJobProcess(HeartBeatData hbData, ResponseHB response) {
       Logger.Debug("Started for Client " + hbData.ClientId);
       List<JobDto> jobsOfClient = new List<JobDto>(DaoLocator.JobDao.FindActiveJobsOfClient(DaoLocator.ClientDao.FindById(hbData.ClientId)));
-      if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {        
+      if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {
         if (jobsOfClient == null || jobsOfClient.Count == 0) {
           response.Success = false;
@@ -372 +361 @@
           DaoLocator.JobDao.Update(curJob);
         }
-       }
+      }
       foreach (JobDto currJob in jobsOfClient) {
         bool found = false;
-        if(hbData.JobProgress != null) {
+        if (hbData.JobProgress != null) {
           foreach (Guid jobId in hbData.JobProgress.Keys) {
             if (jobId == currJob.Id) {
@@ -428 +417 @@
       JobDto job2Calculate = scheduler.GetNextJobForClient(clientId);
       if (job2Calculate != null) {
-        response.Job = job2Calculate;        
+        response.Job = job2Calculate;
         response.Job.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Job);
         response.Success = true;
@@ -437 +426 @@
             newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
         }
-      } else {                  
+      } else {
         response.Success = false;
         response.Job = null;
@@ -449 +438 @@
     }
 
-    public ResponseResultReceived ProcessJobResult(
-      Stream stream,
-      bool finished) {
-
+    public ResponseResultReceived ProcessJobResult(Stream stream, bool finished) {
       Logger.Info("BEGIN Job received for Storage - main method:");
 
-
-      Stream jobResultStream = null;
-      Stream jobStream = null;
+      //Stream jobResultStream = null;
+      //Stream jobStream = null;
 
       //try {
-      BinaryFormatter formatter =
-        new BinaryFormatter();
-
-      JobResult result =
-        (JobResult)formatter.Deserialize(stream);
+      BinaryFormatter formatter = new BinaryFormatter();
+
+      JobResult result = (JobResult)formatter.Deserialize(stream);
 
       //important - repeatable read isolation level is required here, 
@@ -487 +470 @@
         List<byte> serializedJob = new List<byte>();
         int read = 0;
-        int i = 0;        
-        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {          
+        int i = 0;
+        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
           for (int j = 0; j < read; j++) {
             serializedJob.Add(buffer[j]);
           }
-          if (i% 100 == 0)
-            Logger.Debug("Writing to stream: " + i);         
+          if (i % 100 == 0)
+            Logger.Debug("Writing to stream: " + i);
           //jobStream.Write(buffer, 0, read);
           i++;
         }
-        Logger.Debug("Done Writing, closing the stream!");               
+        Logger.Debug("Done Writing, closing the stream!");
         //jobStream.Close();
 
@@ -518 +501 @@
 
       ResponseResultReceived response = new ResponseResultReceived();
-      ClientDto client =
-        DaoLocator.ClientDao.FindById(clientId);
-
-      SerializedJob job =
-        new SerializedJob();
+      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
+
+      SerializedJob job = new SerializedJob();
 
       if (job != null) {
-        job.JobInfo =
-          DaoLocator.JobDao.FindById(jobId);
+        job.JobInfo = DaoLocator.JobDao.FindById(jobId);
         job.JobInfo.Client = job.JobInfo.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
       }
@@ -650 +630 @@
 
       Logger.Info("Client logged out " + clientId);
-      
+
       Response response = new Response();
 
@@ -680 +660 @@
 
       return response;
-    } 
+    }
 
     /// <summary>

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

@@ -64 +64 @@
 
     public static void DestroyContext() {
-      if (ContextFactory.Context != null) {
+      if (ContextFactory.IsContextNull()) {
         ContextFactory.Context.Dispose();
         ContextFactory.Context = null;

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

@@ -24 +24 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.Text;
+using System.IO;
+using System.Threading;
+using System.Transactions;
+using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Server.Core;
+using HeuristicLab.Hive.Server.LINQDataAccess;
 using HeuristicLab.PluginInfrastructure;
-using System.Net;
-using HeuristicLab.Hive.Contracts;
-using HeuristicLab.Hive.Contracts.Interfaces;
-using HeuristicLab.Hive.Server.DataAccess;
-using HeuristicLab.Hive.Contracts.BusinessObjects;
-using System.Diagnostics;
-using HeuristicLab.DataAccess.Interfaces;
-using System.IO;
-using HeuristicLab.Hive.Server.Core;
-using HeuristicLab.Core;
-using HeuristicLab.Hive.Server.LINQDataAccess;
-using System.Transactions;
-using System.Threading;
 using HeuristicLab.Tracing;
 

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

@@ -78 +78 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Tracing-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -136 +139 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
     <EmbeddedResource Include="Authorization\HivePermissionSet.xsd">
@@ -161 +163 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
+      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
+      <Name>HeuristicLab.DataAccess-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
+      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
+      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.3\HeuristicLab.Hive.Server.DataAccess-3.3.csproj">
       <Project>{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}</Project>

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Hive.Server {
-  [Plugin("HeuristicLab.Hive.Server.Core-3.3")]
+  [Plugin("HeuristicLab.Hive.Server.Core", "3.3")]
   [PluginFile("HeuristicLab.Hive.Server.Core-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
-  [PluginDependency("HeuristicLab.DataAccess-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
-  [PluginDependency("HeuristicLab.Hive.JobBase-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Server.DataAccess-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess-3.3")]
-  [PluginDependency("HeuristicLab.Security.Contracts-3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3.0")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Security.Contracts", "3.3")]
+  [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class HiveServerCorePlugin : PluginBase {
   }

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

@@ -55 +55 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4077")]
-[assembly: AssemblyFileVersion("3.3.0.4077")]
-[assembly: AssemblyBuildDate("2010/07/22 13:53:39")]
+[assembly: AssemblyVersion("3.3.0.4078")]
+[assembly: AssemblyFileVersion("3.3.0.4078")]
+[assembly: AssemblyBuildDate("2010/07/23 09:04:35")]

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Hive.DataAccess {
-  [Plugin("HeuristicLab.Hive.Server.DataAccess-3.3")]
+  [Plugin("HeuristicLab.Hive.Server.DataAccess", "3.3")]
   [PluginFile("HeuristicLab.Hive.Server.DataAccess-3.3.dll", PluginFileType.Assembly)]  
-  [PluginDependency("HeuristicLab.Core-3.3")]
-  [PluginDependency("HeuristicLab.DataAccess-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   public class HiveServerDataAccessPlugin : PluginBase {
   }

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

@@ -125 +125 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
+      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
+      <Name>HeuristicLab.DataAccess-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
@@ -138 +142 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

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

@@ -6 +6 @@
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
-  [Plugin("HeuristicLab.Hive.Server.LINQDataAccess-3.3")]
+  [Plugin("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
   [PluginFile("HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Contracts-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Server.DataAccess-3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3.0")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class LINQDataAccessPlugin: PluginBase {
   }

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

@@ -93 +93 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DefaultScheduler.cs" />
     <Compile Include="HiveServerSchedulerPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -105 +104 @@
       <Project>{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}</Project>
       <Name>HeuristicLab.DataAccess.ADOHelper-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
+      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
+      <Name>HeuristicLab.DataAccess-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Scheduler/3.3/HiveServerSchedulerPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Hive.Server {
-  [Plugin("HeuristicLab.Hive.Server.Scheduler-3.3")]
+  [Plugin("HeuristicLab.Hive.Server.Scheduler", "3.3")]
   [PluginFile("HeuristicLab.Hive.Server.Scheduler-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
-  [PluginDependency("HeuristicLab.Hive.Server-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Server", "3.3")]
   public class HiveServerSchedulerPlugin : PluginBase {
   }

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

@@ -165 +165 @@
       baseAddrDict.Add(STR_ExecutionEngineFacade, StartService(Services.ExecutionEngineFacade, addresses[index], WcfSettings.DEFAULTPORT));
 
+      // [chn] why is lifecyclemanager instantiated here?? shouldnt Core.ServiceLocator be used?
       IEnumerable<ILifecycleManager> lifecycleManagers = ApplicationManager.Manager.GetInstances<ILifecycleManager>();
       if (lifecycleManagers.Count() > 0) {

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

@@ -38 +38 @@
       Object obj = null;
 
-      Object[] attributes = invocation.Method.GetCustomAttributes(typeof (SpringTransaction), true);
+      Object[] attributes = invocation.Method.GetCustomAttributes(typeof(SpringTransaction), true);
       foreach (Object o in attributes) {
-        SpringTransaction st = (SpringTransaction) o;
+        SpringTransaction st = (SpringTransaction)o;
         userTransaction = st.UserTransaction;
       }
       if (UseTransactions && !userTransaction) {
         using (
-          TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
-                                                        new TransactionOptions
-                                                        {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})) {
+          TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
           try {
             Logger.Debug("Current Transaction Isolation level is: " + Transaction.Current.IsolationLevel);
@@ -64 +62 @@
           }
         }
-      }
-      else {
+      } else {
         try {
           obj = invocation.Proceed();
@@ -79 +76 @@
         }
       }
-      //}       
+   
       TimeSpan ts = DateTime.Now - start;
       if (ts.Seconds > 2) {
         Logger.Warn("Invocation took: " + ts);
-      }
-      else if (ts.Seconds > 10) {
+      } else if (ts.Seconds > 10) {
         Logger.Error("Invocation took: " + ts);
-      }
-      else {
+      } else {
         Logger.Info("Invocation took: " + ts);
         ;

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

@@ -2 +2 @@
 ; List of project directories and file names separated by ':' that are part of the installation
 
+HeuristicLab.DataAccess\3.3:HeuristicLab.DataAccess-3.3.dll
+HeuristicLab.DataAccess.ADOHelper\3.3:HeuristicLab.DataAccess.ADOHelper-3.3.dll
+
+HeuristicLab.Hive.Client.Common\3.3:HeuristicLab.Hive.Client.Common-3.3.dll
+HeuristicLab.Hive.Client.Communication\3.3:HeuristicLab.Hive.Client.Communication-3.3.dll
+HeuristicLab.Hive.Client.Console\3.3:Calendar.DayView.dll
+HeuristicLab.Hive.Client.Console\3.3:HeuristicLab.Hive.Client.Console-3.3.dll
+HeuristicLab.Hive.Client.Console\3.3:ZedGraph.dll
 HeuristicLab.Hive.Client.Core\3.3:HeuristicLab.Hive.Client.Core-3.3.dll
+HeuristicLab.Hive.Client.ExecutionEngine\3.3:HeuristicLab.Hive.Client.ExecutionEngine-3.3.dll
+
+HeuristicLab.Hive.Engine\3.3:HeuristicLab.Hive.Engine-3.3.dll
+HeuristicLab.Hive.JobBase\3.3:HeuristicLab.Hive.JobBase-3.3.dll
+
+HeuristicLab.Hive.Server\3.3:HeuristicLab.Hive.Server-3.3.dll
+HeuristicLab.Hive.Server.ADODataAccess\3.3:HeuristicLab.Hive.Server.ADODataAccess-3.3.dll
+HeuristicLab.Hive.Server.Console\3.3:HeuristicLab.Hive.Server.Console-3.3.dll
+HeuristicLab.Hive.Server.Core\3.3:Authorization\*.xml
+HeuristicLab.Hive.Server.Core\3.3:HeuristicLab.Hive.Contracts-3.3.dll
 HeuristicLab.Hive.Server.Core\3.3:HeuristicLab.Hive.Server.Core-3.3.dll
+HeuristicLab.Hive.Server.DataAccess\3.3:HeuristicLab.Hive.Server.DataAccess-3.3.dll
+HeuristicLab.Hive.Server.LINQDataAccess\3.3:HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll
+HeuristicLab.Hive.Server.Scheduler\3.3:HeuristicLab.Hive.Server.Scheduler-3.3.dll
+
+HeuristicLab.Security.ADODataAccess\3.3:HeuristicLab.Security.ADODataAccess-3.3.dll
+HeuristicLab.Security.Contracts\3.3:HeuristicLab.Security.Contracts-3.3.dll
+HeuristicLab.Security.Core\3.3:HeuristicLab.Security.Core-3.3.dll
+HeuristicLab.Security.DataAccess\3.3:HeuristicLab.Security.DataAccess-3.3.dll
+HeuristicLab.Security.Server\3.3:HeuristicLab.Security.Server-3.3.dll
 
 ;External Libraries
-
+HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:HeuristicLab.SpringNET-1.3.0.dll
+HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Common.Logging.dll
+HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Spring.Aop.dll
+HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0:Spring.Core.dll
+HeuristicLab.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

@@ -23 +23 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33 +34 @@
   </PropertyGroup>
   <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -58 +59 @@
   <ItemGroup />
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="CopyAssemblies.cmd" />
     <None Include="CustomPostBuild.cmd" />
     <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
-    <None Include="HeuristicLab 3.3.exe.config" />
+    <None Include="HeuristicLab 3.3.exe.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="HeuristicLab.snk" />
     <None Include="MergeConfigs.cmd" />

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

@@ -1 @@
-ConfigMerger "%SolutionDir%\HeuristicLab.Hive\3.3\HeuristicLab 3.3.exe.config" "HeuristicLab 3.3.exe.config"
+ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 
-;ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\3.3\%Outdir%\HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config"
+ConfigMerger "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

@@ -51 +51 @@
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.0.4077")]
-[assembly: AssemblyFileVersion("3.3.0.4077")]
+[assembly: AssemblyVersion("3.3.0.4078")]
+[assembly: AssemblyFileVersion("3.3.0.4078")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Contracts/3.3/SecurityContractsPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Security.Contracts {
-  [Plugin("HeuristicLab.Security.Contracts-3.3")]
+  [Plugin("HeuristicLab.Security.Contracts", "3.3")]
   [PluginFile("HeuristicLab.Security.Contracts-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
   public class SecurityContractsPlugin : PluginBase {
   }

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

@@ -124 +124 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Core/3.3/SecurityCorePlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Security.Core {
-  [Plugin("HeuristicLab.Security.Core-3.3")]
+  [Plugin("HeuristicLab.Security.Core", "3.3")]
   [PluginFile("HeuristicLab.Security.Core-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
   public class SecurityCorePlugin : PluginBase {
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.DataAccess/3.3/SecurityDataAccessPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Security.DataAccess {
-  [Plugin("HeuristicLab.Security.DataAccess-3.3")]
+  [Plugin("HeuristicLab.Security.DataAccess", "3.3")]
   [PluginFile("HeuristicLab.Security.DataAccess-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
   public class SecurityDataAccessPlugin : PluginBase {
   }