Changeset 5105 for branches

Timestamp:

12/14/10 16:11:39 (13 years ago)

Author:

ascheibe

Message:

ported most of the slave code to 3.4 #1233

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• ConfigManager.cs (added)
• Core.cs (added)
• Executor.cs (added)
• HeartbeatManager.cs (added)
• HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (3 diffs)
• InvalidStateException.cs (added)
• JobStatus.cs (added)
• Logger.cs (added)
• MessageQueue.cs (added)
• NetworkEnum.cs (added)
• PluginCache.cs (added)
• PluginUtil.cs (added)
• Properties/Settings.Designer.cs (added)
• Properties/Settings.settings (added)
• SlaveDummy.cs (deleted)
• SlaveStatusInfo.cs (added)
• StatusCommons.cs (added)
• WcfService.cs (added)
• app.config (added)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -55 +55 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -61 +63 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SlaveDummy.cs" />
+    <Compile Include="ConfigManager.cs" />
+    <Compile Include="Core.cs" />
+    <Compile Include="Executor.cs" />
+    <Compile Include="HeartbeatManager.cs" />
+    <Compile Include="InvalidStateException.cs" />
+    <Compile Include="JobStatus.cs" />
+    <Compile Include="Logger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MessageQueue.cs" />
+    <Compile Include="NetworkEnum.cs" />
+    <Compile Include="PluginCache.cs" />
+    <Compile Include="PluginUtil.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="SlaveStatusInfo.cs" />
+    <Compile Include="StatusCommons.cs" />
+    <Compile Include="WcfService.cs" />
+    <None Include="app.config" />
     <None Include="HeuristicLabClientsHiveSlavePlugin.cs.frame" />
     <Compile Include="HeuristicLabClientsHiveSlavePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
@@ -74 +101 @@
       <Project>{B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}</Project>
       <Name>HeuristicLab.Clients.Hive-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive\3.4\HeuristicLab.Hive-3.4.csproj">
+      <Project>{F98A1740-9AC9-4D36-A582-6A2D0D06978D}</Project>
+      <Name>HeuristicLab.Hive-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Services.Hive.Common\3.4\HeuristicLab.Services.Hive.Common-3.4.csproj">