Changeset 4629 for branches

Timestamp:

10/20/10 15:05:55 (14 years ago)

Author:

cneumuel

Message:

• worked on new hive structure
• created IIS hostable website for hive (old structure)

(#1233)

Location:

branches/HeuristicLab.Hive/sources

Files:

• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Administration (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Exceptions (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Exceptions/AddJobToHiveException.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Exceptions/JobResultPollingException.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Exceptions/OptimizerNotFoundException.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveClient.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveExperiment.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveExperimentList.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJob.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJobList.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/JobResultPoller.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Jobs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Jobs/JobList.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Jobs/OptimizerJob.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/PersistenceUtil.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Progress (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Progress/IProgress.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Progress/IProgressReporter.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Progress/Progress.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Properties/Settings.Designer.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Properties/Settings.settings (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/ServiceClients (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/ServiceClients/GenerateServiceClients.cmd (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/ServiceClients/ServiceClientFactory.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/ServiceClients/ServiceClientFactoryException.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/ServiceLocator.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Slave (added)
• HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/app.config (added)
• HeuristicLab.Hive.New/HeuristicLab.Hive.sln (modified) (4 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Hive/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Appointment.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HeartBeat.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveExperiment.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveItem.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePlugin.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePluginData.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobData.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/LightweightJob.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/NamedHiveItem.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Slave.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveConfig.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveGroup.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveState.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/UpTimeStatistics.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/HeuristicLab.Services.Hive.Common-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/MessageContainer.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/ServiceContracts/IHiveService.cs (modified) (6 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3 (modified) (1 prop)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/ContextFactory.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.snk (added)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs (modified) (2 diffs)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs (modified) (1 diff)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Tools (added)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Tools/CreateHiveDatabaseApplication.cs (added)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Tools/cleanHiveDatabase.sql (added)
• HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Tools/prepareHiveDatabase.sql (added)
• HeuristicLab.Hive.New/MergeConfigs.cmd (modified) (1 diff)
• HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln (modified) (2 diffs)
• HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config (modified) (2 diffs)
• HeuristicLab.Hive/HiveWeb (added)
• HeuristicLab.Hive/HiveWeb/App_Code (added)
• HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs (added)
• HeuristicLab.Hive/HiveWeb/App_Data (added)
• HeuristicLab.Hive/HiveWeb/ClientService.svc (added)
• HeuristicLab.Hive/HiveWeb/HeuristicLab.log4net.xml (added)
• HeuristicLab.Hive/HiveWeb/ServerConsoleService.svc (added)
• HeuristicLab.Hive/HiveWeb/SlaveService.svc (added)
• HeuristicLab.Hive/HiveWeb/Web.config (added)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj

@@ -31 +31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HeuristicLab.Common-3.3">
@@ -56 +62 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

@@ -31 +31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HeuristicLab.Common-3.3">
@@ -55 +61 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

@@ -31 +31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HeuristicLab.Common-3.3">
@@ -55 +61 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3

@@ -2 +2 @@
 obj
 obj
+*.user

@@ -2 +2 @@
 obj
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -31 +31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Clients.Common-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3">
@@ -44 +61 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Tracing-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -52 +73 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Exceptions\AddJobToHiveException.cs" />
+    <Compile Include="Exceptions\JobResultPollingException.cs" />
+    <Compile Include="Exceptions\OptimizerNotFoundException.cs" />
+    <Compile Include="HiveExperiment\HiveExperimentList.cs" />
+    <Compile Include="HiveExperiment\HiveJobList.cs" />
+    <Compile Include="Jobs\JobList.cs" />
+    <Compile Include="Jobs\OptimizerJob.cs" />
     <Compile Include="HeuristicLabClientsHivePlugin.cs" />
+    <Compile Include="HiveExperiment\HiveClient.cs" />
+    <Compile Include="HiveExperiment\HiveJob.cs" />
+    <Compile Include="HiveExperiment\HiveExperiment.cs" />
+    <Compile Include="HiveExperiment\JobResultPoller.cs" />
+    <Compile Include="Progress\IProgress.cs" />
+    <Compile Include="Progress\IProgressReporter.cs" />
+    <Compile Include="Progress\Progress.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PersistenceUtil.cs" />
+    <Compile Include="ServiceClients\ServiceClientFactory.cs" />
+    <Compile Include="ServiceClients\ServiceClientFactoryException.cs" />
+    <Compile Include="ServiceLocator.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <None Include="app.config" />
+    <None Include="HeuristicLab.snk" />
+    <None Include="ServiceClients\GenerateServiceClients.cmd" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Administration\" />
+    <Folder Include="Slave\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj">
+      <Project>{F98A1740-9AC9-4D36-A582-6A2D0D06978D}</Project>
+      <Name>HeuristicLab.Hive-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Services.Hive.Common\3.3\HeuristicLab.Services.Hive.Common-3.3.csproj">
+      <Project>{14424A16-48D4-445E-80BF-DDF617548BBB}</Project>
+      <Name>HeuristicLab.Services.Hive.Common-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive.sln

@@ -3 +3 @@
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive-3.3", "HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj", "{F98A1740-9AC9-4D36-A582-6A2D0D06978D}"
-  ProjectSection(ProjectDependencies) = postProject
-    {E1D6C801-892A-406A-B606-F158E36DD3C3} = {E1D6C801-892A-406A-B606-F158E36DD3C3}
-    {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC} = {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}
-    {14424A16-48D4-445E-80BF-DDF617548BBB} = {14424A16-48D4-445E-80BF-DDF617548BBB}
-    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE} = {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}
-    {989FE92B-484E-41EE-87E2-6A24AF0381D8} = {989FE92B-484E-41EE-87E2-6A24AF0381D8}
-    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8} = {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}
-    {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB} = {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}
-  EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.3", "HeuristicLab.Clients.Hive.Slave\3.3\HeuristicLab.Clients.Hive.Slave-3.3.csproj", "{989FE92B-484E-41EE-87E2-6A24AF0381D8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.Common-3.3", "HeuristicLab.Services.Hive.Common\3.3\HeuristicLab.Services.Hive.Common-3.3.csproj", "{14424A16-48D4-445E-80BF-DDF617548BBB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.3", "HeuristicLab.Services.Hive.Server\3.3\HeuristicLab.Services.Hive-3.3.csproj", "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.DataAccess-3.3", "HeuristicLab.Services.Hive.DataAccess\3.3\HeuristicLab.Services.Hive.DataAccess-3.3.csproj", "{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}"
@@ -35 +24 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.Views-3.3", "HeuristicLab.Clients.Hive.Slave.Views\3.3\HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj", "{8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.3", "HeuristicLab.Services.Hive\3.3\HeuristicLab.Services.Hive-3.3.csproj", "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}"
 EndProject
 Global
@@ -54 +45 @@
     {14424A16-48D4-445E-80BF-DDF617548BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {14424A16-48D4-445E-80BF-DDF617548BBB}.Release|Any CPU.Build.0 = Release|Any CPU
-    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.Build.0 = Release|Any CPU
     {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -74 +61 @@
     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|Any CPU.Build.0 = Release|Any CPU
+    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|Any CPU.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive/3.3

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

@@ -32 +32 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HeuristicLab.Common-3.3">
@@ -57 +63 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>set ProjectName=$(ProjectName)
 set TargetPath=$(TargetPath)
+set TargetDir=$(TargetDir)
 set SolutionDir=$(SolutionDir)
-call $(SolutionDir)/MergeConfigs.cmd
-call $(SolutionDir)/CopyAssembly.cmd</PostBuildEvent>
+call $(SolutionDir)/CopyAssembly.cmd
+call $(SolutionDir)/MergeConfigs.cmd</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Appointment.cs

@@ -22 +22 @@
 using System;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -38 +39 @@
     [DataMember]
     public Guid ResourceId { get; set; }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      Appointment clone = (Appointment)base.Clone(cloner);
+      clone.AllDayEvent = this.AllDayEvent;
+      clone.EndDate = this.EndDate;
+      clone.Recurring = this.Recurring;
+      clone.RecurringId = this.RecurringId;
+      clone.ResourceId = this.ResourceId;
+      clone.StartDate = this.StartDate;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HeartBeat.cs

@@ -27 +27 @@
 
   [DataContract]
-  public class HeartBeat {
+  public class Heartbeat {
     [DataMember]
     public Guid SlaveId { get; set; }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveExperiment.cs

@@ -39 +39 @@
       return base.ToString() + "Name: " + Name + ", Description: " + Description + ", ResourceIds: " + ResourceIds;
     }
-
-    public HiveExperiment() {
+    
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (HiveExperiment)base.Clone(cloner);
+      clone.ResourceIds = this.ResourceIds;
+      clone.RootJobId = this.RootJobId;
+      clone.UserId = this.UserId;
+      return clone;
     }
   }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveItem.cs

@@ -4 +4 @@
 using System.Text;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
   [DataContract]
-  public abstract class HiveItem {
+  public abstract class HiveItem : IDeepCloneable {
     [DataMember]
     public Guid Id { get; set; }
+
+    public virtual IDeepCloneable Clone(Cloner cloner) {
+      HiveItem clone = (HiveItem)Activator.CreateInstance(this.GetType(), true);
+      cloner.RegisterClonedObject(this, clone);
+      clone.Id = this.Id;
+      return clone;
+    }
+
+    public object Clone() {
+      return Clone(new Cloner());
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePlugin.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -32 +33 @@
     public Version Version { get; set; }
     [DataMember]
-    public Boolean Update { get; set; }
+    public bool Update { get; set; }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (HivePlugin)base.Clone(cloner);
+      clone.Version = this.Version;
+      clone.Update = this.Update;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HivePluginData.cs

@@ -22 +22 @@
 using System;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -34 +35 @@
       Name = name;
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (HivePluginData)base.Clone(cloner);
+      if (this.Data != null) clone.Data = new byte[this.Data.Length]; Array.Copy(this.Data, clone.Data, this.Data.Length);
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs

@@ -55 +55 @@
       AssignedResourceIds = new List<Guid>();
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (Job)base.Clone(cloner);
+      clone.UserId = this.UserId;
+      clone.Priority = this.Priority;
+      clone.CoresNeeded = this.CoresNeeded;
+      clone.MemoryNeeded = this.MemoryNeeded;
+      clone.PluginsNeededIds = new List<Guid>(this.PluginsNeededIds);
+      clone.AssignedResourceIds = new List<Guid>(this.AssignedResourceIds);
+      clone.ProjectId = this.ProjectId;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobData.cs

@@ -23 +23 @@
 using System.IO;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -32 +33 @@
     [DataMember]
     public byte[] Data { get; set; }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (JobData)base.Clone(cloner);
+      if (this.Data != null) clone.Data = new byte[this.Data.Length]; Array.Copy(this.Data, clone.Data, this.Data.Length);
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/LightweightJob.cs

@@ -22 +22 @@
 using System;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -56 +57 @@
       this.ParentJobId = job.ParentJobId;
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (LightweightJob)base.Clone(cloner);
+      clone.SlaveId = this.SlaveId;
+      clone.State = this.State;
+      clone.ExecutionTime = this.ExecutionTime;
+      clone.Exception = this.Exception;
+      clone.DateCreated = this.DateCreated;
+      clone.DateCalculated = this.DateCalculated;
+      clone.DateFinished = this.DateFinished;
+      clone.ParentJobId = this.ParentJobId;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/NamedHiveItem.cs

@@ -4 +4 @@
 using System.Text;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -12 +13 @@
     [DataMember]
     public string Description { get; set; }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (NamedHiveItem)base.Clone(cloner);
+      clone.Name = this.Name;
+      clone.Description = this.Description;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Slave.cs

@@ -29 +29 @@
   public class Slave : Resource {
     [DataMember]
-    public int? NrOfCores { get; set; }
+    public int? Cores { get; set; }
     [DataMember]
-    public int? NrOfFreeCores { get; set; }
+    public int? FreeCores { get; set; }
     [DataMember]
     public int? CpuSpeedPerCore { get; set; }
@@ -39 +39 @@
     public int? FreeMemory { get; set; }
     [DataMember]
-    public DateTime? Login { get; set; }
-    [DataMember]
     public SlaveState State { get; set; }
     [DataMember]
     public CalendarState CalendarSyncStatus { get; set; }
     [DataMember]
-    public SlaveConfig Config { get; set; }
+    public Guid SlaveConfigId { get; set; }
     [DataMember]
     public bool IsAllowedToCalculate { get; set; }
 
     public override string ToString() {
-      return base.ToString() + ", NrOfCores: " + NrOfCores + ", NrOfFreeCores " + NrOfFreeCores + ", Login: " + Login + ", State: " + State;
+      return base.ToString() + ", NrOfCores: " + Cores + ", NrOfFreeCores " + FreeCores + ", State: " + State;
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (Slave)base.Clone(cloner);
+      clone.Cores = this.Cores;
+      clone.FreeCores = this.FreeCores;
+      clone.CpuSpeedPerCore = this.CpuSpeedPerCore;
+      clone.Memory = this.Memory;
+      clone.FreeMemory = this.FreeMemory;
+      clone.State = this.State;
+      clone.CalendarSyncStatus = this.CalendarSyncStatus;
+      clone.SlaveConfigId = this.SlaveConfigId;
+      clone.IsAllowedToCalculate = this.IsAllowedToCalculate;
+      return clone;
     }
   }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveConfig.cs

@@ -32 +32 @@
     [DataMember]
     public int? HeartBeatIntervall { get; set; }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (SlaveConfig)base.Clone(cloner);
+      clone.UpDownTimeCalendar = this.UpDownTimeCalendar;
+      clone.HeartBeatIntervall = this.HeartBeatIntervall;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveGroup.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Runtime.Serialization;
+using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -28 +30 @@
   public class SlaveGroup : Resource {
     [DataMember]
-    public List<Resource> Resources { get; set; }
+    public List<Guid> ResourcesIds { get; set; }
 
     public SlaveGroup() {
-      Resources = new List<Resource>();
+      ResourcesIds = new List<Guid>();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (SlaveGroup)base.Clone(cloner);
+      clone.ResourcesIds = new List<Guid>(this.ResourcesIds);
+      return clone;
     }
   }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/SlaveState.cs

@@ -23 +23 @@
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
   public enum SlaveState {
-    NullState,
     Idle,
     Calculating,

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/UpTimeStatistics.cs

@@ -22 +22 @@
 using System;
 using System.Runtime.Serialization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Services.Hive.Common.DataTransfer {
@@ -27 +28 @@
   public class UpTimeStatistics : HiveItem {
     [DataMember]
-    public Slave Slave { get; set; }
+    public Guid SlaveId { get; set; }
     [DataMember]
     public DateTime Login { get; set; }
     [DataMember]
     public DateTime Logout { get; set; }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      var clone = (UpTimeStatistics)base.Clone(cloner);
+      clone.SlaveId = this.SlaveId;
+      clone.Login = this.Login;
+      clone.Logout = this.Logout;
+      return clone;
+    }
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/HeuristicLab.Services.Hive.Common-3.3.csproj

@@ -30 +30 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
@@ -81 +87 @@
     <Compile Include="ServiceContracts\IHiveService.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/MessageContainer.cs

@@ -43 +43 @@
       JobFailed, 
       UptimeLimitDisconnect,
-      FetchOrForceFetchCalendar, 
+      UpdateCalendar, 
       AddChildJob,
       PauseJob,

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/ServiceContracts/IHiveService.cs

@@ -6 +6 @@
 using System.IO;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
+using System.Net.Security;
 
 namespace HeuristicLab.Services.Hive.Common.ServiceContracts {
+
+  [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)]
   public interface IHiveService {
 
-    // todo: Rename:
-    //  Result is ambiguous; sometimes it refers to a serialized job which has finished, sometimes it is the current state of the job
     #region Job Methods
     [OperationContract]
@@ -81 +82 @@
 
     #region HiveExperiment Methods
+    [OperationContract]
+    HiveExperiment GetHiveExperiment(Guid id);
+
     /// <summary>
     /// Returns all experiments for the current user
@@ -86 +90 @@
     [OperationContract]
     IEnumerable<HiveExperiment> GetHiveExperiments();
+
+    [OperationContract]
+    Guid AddHiveExperiment(HiveExperiment hiveExperimentDto);
 
     [OperationContract]
@@ -113 +120 @@
     /// </summary>
     /// <returns></returns>
-    [OperationContract]
-    void Login();
-    /// <summary>
-    /// This method registers the slave and marks it as online
-    /// </summary>
-    [OperationContract]
-    void Login(Slave slave);
-    [OperationContract]
-    void Logout(Guid clientId);
+    //[OperationContract]
+    //void Login();
+    ///// <summary>
+    ///// This method registers the slave and marks it as online
+    ///// </summary>
+    //[OperationContract]
+    //void Login(Slave slave);
+    //[OperationContract]
+    //void Logout(Guid clientId);
     #endregion
 
     #region Heartbeat Methods
     [OperationContract]
-    List<MessageContainer> ProcessHeartBeat(HeartBeat heartbeat);
+    List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat);
     #endregion
 
@@ -138 +145 @@
     #region Calendar Methods
     [OperationContract]
-    IEnumerable<Appointment> GetCalendar(Guid clientId);
+    IEnumerable<Appointment> GetCalendar(Guid slaveId);
     [OperationContract]
     void SetCalendarStatus(Guid clientId, CalendarState state);
@@ -171 +178 @@
     [OperationContract]
     void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId);
+
+    [OperationContract]
+    void UpdateSlave(Slave slave);
     #endregion
     

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/ContextFactory.cs

@@ -75 +75 @@
           transactions.Add(threadId, transaction);
         }
-        return context;
+        return disposableContext;
       }
     }
@@ -96 +96 @@
       lock (locker) {
         int threadId = Thread.CurrentThread.ManagedThreadId;
-        contexts[threadId].Dispose();
+        contexts[threadId].Obj.Dispose();
         contexts.Remove(threadId);
         // context gets disposed implicitly, when it is used as IDisposable

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

@@ -30 +30 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
@@ -75 +81 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="Tools\CreateHiveDatabaseApplication.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -83 +90 @@
       <SubType>Designer</SubType>
     </None>
+    <None Include="HeuristicLab.snk" />
     <None Include="HiveDataContext.dbml">
       <Generator>MSLinqToSQLGenerator</Generator>
@@ -104 +112 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Tools\cleanHiveDatabase.sql" />
+    <Content Include="Tools\prepareHiveDatabase.sql" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs

@@ -58 +58 @@
                   orderby ar.Job.Priority descending
                   select Convert.ToDto(ar.Job);
-      return query.ToArray();
+      return query;
+    }
+
+    public IEnumerable<DT.Job> GetAvailableJobs(DT.Slave slave) {
+      var query = from j in db.Jobs
+                  where j.JobState == JobState.Waiting && j.CoresNeeded <= slave.FreeCores && j.MemoryNeeded <= slave.FreeMemory
+                  orderby j.Priority descending
+                  select Convert.ToDto(j);
+      return query.Union(GetAvailableParentJobs(slave.Id)).OrderByDescending(x => x.Priority).ToArray();
     }
     #endregion
@@ -217 +225 @@
     public bool IsUserAuthorizedForJobs(Guid userId, params Guid[] jobIds) {
       var userIds = from job in db.Jobs // this needs to be fast!
-                 where jobIds.Contains(job.JobId)
-                 select job.UserId;
+                    where jobIds.Contains(job.JobId)
+                    select job.UserId;
       return userIds.All(x => x == userId);
     }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs

@@ -15 +15 @@
     void UpdateJob(DT.Job dto);
     void DeleteJob(Guid id);
-    IEnumerable<DT.Job> GetAvailableParentJobs(Guid slaveId);
+    IEnumerable<DT.Job> GetAvailableJobs(DT.Slave slave);
     #endregion
 

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/MergeConfigs.cmd

@@ -1 @@
-copy "%SolutionDir%HeuristicLab.Hive-3.3.dll.config" "%TargetPath%"
-echo HeuristicLab.Hive-3.3.dll.config copied
+copy "%SolutionDir%HeuristicLab.Hive-3.3.dll.config" "%TargetDir%"
 
-%SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive\3.3\app.config" "%TargetPath%HeuristicLab.Hive-3.3.dll.config"
-%SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive.DataAccess\3.3\app.config" "%TargetPath%HeuristicLab.Hive-3.3.dll.config"
+%SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive\3.3\app.config" "%TargetDir%HeuristicLab.Hive-3.3.dll.config"
+%SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Services.Hive.DataAccess\3.3\app.config" "%TargetDir%HeuristicLab.Hive-3.3.dll.config"
 
-copy "%SolutionDir%HeuristicLab-3.3.dll.config" "%TargetPath%"
-echo HeuristicLab-3.3.dll.config copied
+copy "%SolutionDir%HeuristicLab 3.3.exe.config" "%TargetDir%"
 
-%SolutionDir%ConfigMerger "HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config"
+%SolutionDir%ConfigMerger "%SolutionDir%HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config"
+
+copy "HeuristicLab 3.3.exe.config" "%target%"

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs

@@ -58 +58 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.4560")]
+[assembly: AssemblyFileVersion("3.3.0.4598")]

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

@@ -81 +81 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.ExecutionEngine-3.3", "HeuristicLab.Hive.Slave.ExecutionEngine\3.3\HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HiveWeb", "..\..\..\..\..\Web\HiveWeb\", "{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}"
+  ProjectSection(WebsiteProperties) = preProject
+    TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+    Debug.AspNetCompiler.VirtualPath = "/HiveWeb"
+    Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\"
+    Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\"
+    Debug.AspNetCompiler.Updateable = "true"
+    Debug.AspNetCompiler.ForceOverwrite = "true"
+    Debug.AspNetCompiler.FixedNames = "false"
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.VirtualPath = "/HiveWeb"
+    Release.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\"
+    Release.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\"
+    Release.AspNetCompiler.Updateable = "true"
+    Release.AspNetCompiler.ForceOverwrite = "true"
+    Release.AspNetCompiler.FixedNames = "false"
+    Release.AspNetCompiler.Debug = "False"
+    VWDPort = "2681"
+  EndProjectSection
 EndProject
 Global
@@ -372 +392 @@
     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.Build.0 = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x64.ActiveCfg = Debug|Any CPU
+    {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x86.ActiveCfg = Debug|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

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

@@ -192 +192 @@
 call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config

@@ -63 +63 @@
 
   <system.serviceModel>
-
     <diagnostics>
       <messageLogging logEntireMessage="true" logMalformedMessages="true"
@@ -141 +140 @@
       </service>
     </services>
-
   </system.serviceModel>
 

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -2 +2 @@
 obj
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user