Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/20/15 16:41:14 (10 years ago)
Author:
dglaser
Message:

#2388 merged trunk into hive statistics branch

Location:
branches/HiveStatistics/sources
Files:
1 deleted
41 edited

Legend:

Unmodified
Added
Removed
  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/DummyListener.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/AppDomainNotCreatedException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/InvalidStateException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/JobAlreadyExistsException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/OutOfCoresException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/OutOfMemoryException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/SerializationException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/TaskAlreadyRunningException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/TaskFailedException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/TaskNotDataFoundException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/TaskNotFoundException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Exceptions/TaskNotRunningException.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/ExecutorMessage.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/ExecutorQueue.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

    r8600 r12395  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.SlaveCore</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.SlaveCore-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
     
    2424    <WarningLevel>4</WarningLevel>
    2525    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     26    <Prefer32Bit>false</Prefer32Bit>
    2627  </PropertyGroup>
    2728  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3536    </DocumentationFile>
    3637    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     38    <Prefer32Bit>false</Prefer32Bit>
    3739  </PropertyGroup>
    3840  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4446    <ErrorReport>prompt</ErrorReport>
    4547    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4649  </PropertyGroup>
    4750  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    5558    <ErrorReport>prompt</ErrorReport>
    5659    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5761  </PropertyGroup>
    5862  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    6468    <ErrorReport>prompt</ErrorReport>
    6569    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     70    <Prefer32Bit>false</Prefer32Bit>
    6671  </PropertyGroup>
    6772  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    7580    <ErrorReport>prompt</ErrorReport>
    7681    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <Prefer32Bit>false</Prefer32Bit>
    7783  </PropertyGroup>
    7884  <PropertyGroup>
     
    177183    <None Include="HeuristicLab.snk" />
    178184  </ItemGroup>
    179   <ItemGroup>
    180     <Content Include="ICSharpCode.SharpZipLib License.txt">
    181       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    182     </Content>
    183   </ItemGroup>
    184185  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    185186  <PropertyGroup>
     
    188189  </PropertyGroup>
    189190  <PropertyGroup>
    190    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     191    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    191192set ProjectDir=$(ProjectDir)
    192193set SolutionDir=$(SolutionDir)
     
    194195
    195196call PreBuildEvent.cmd</PreBuildEvent>
    196 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     197    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    197198export ProjectDir=$(ProjectDir)
    198199export SolutionDir=$(SolutionDir)
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/IPluginProvider.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using System.Linq;
    2626using System.Management;
     27using System.Net.NetworkInformation;
    2728using HeuristicLab.Clients.Hive.SlaveCore.Properties;
    2829
     
    3435  public class ConfigManager {
    3536    private static ConfigManager instance = null;
     37    private const string vmwareNameString = "VMware";
     38    private const string virtualboxNameString = "VirtualBox";
     39    private const int macLength = 6;
     40    private const int macLongLength = 8;
     41
    3642    public static ConfigManager Instance {
    3743      get { return instance; }
     
    184190    /// </summary>   
    185191    private static Guid GetUniqueMachineIdFromMac() {
    186       ManagementClass mgtClass = new ManagementClass("Win32_NetworkAdapterConfiguration");
    187       ManagementObjectCollection mgtCol = mgtClass.GetInstances();
    188 
    189       foreach (ManagementObject mgtObj in mgtCol) {
    190         foreach (var prop in mgtObj.Properties) {
    191           if (prop.Value != null && prop.Name == "MACAddress") {
    192             try {
    193               //simply take the first nic
    194               string mac = prop.Value.ToString();
    195               byte[] b = new byte[8];
    196               string[] macParts = mac.Split(':');
    197               if (macParts.Length == 6) {
    198                 for (int i = 0; i < macParts.Length; i++) {
    199                   b[i + 2] = (byte)((ParseNybble(macParts[i][0]) << 4) | ParseNybble(macParts[i][1]));
    200                 }
    201 
    202                 // also get machine name and save it to the first 4 bytes               
    203                 Guid guid = new Guid(Environment.MachineName.GetHashCode(), 0, 0, b);
    204                 return guid;
    205               } else
    206                 throw new Exception("Error getting mac addresse");
    207             }
    208             catch {
    209               throw new Exception("Error getting mac addresse");
    210             }
    211           }
    212         }
    213       }
    214       throw new Exception("Error getting mac addresse");
    215     }
    216 
    217     /// <summary>
    218     /// return numeric value of a single hex-char
    219     /// (see: http://stackoverflow.com/questions/854012/how-to-convert-hex-to-a-byte-array)
    220     /// </summary>   
    221     static int ParseNybble(char c) {
    222       if (c >= '0' && c <= '9') {
    223         return c - '0';
    224       }
    225       if (c >= 'A' && c <= 'F') {
    226         return c - 'A' + 10;
    227       }
    228       if (c >= 'a' && c <= 'f') {
    229         return c - 'a' + 10;
    230       }
    231       throw new ArgumentException("Invalid hex digit: " + c);
     192      //try to get a real network interface, not a virtual one
     193      NetworkInterface validNic = NetworkInterface.GetAllNetworkInterfaces()
     194                      .FirstOrDefault(x =>
     195                                  !x.Name.Contains(vmwareNameString) &&
     196                                  !x.Name.Contains(virtualboxNameString) &&
     197                                  (x.NetworkInterfaceType == NetworkInterfaceType.Ethernet ||
     198                                   x.NetworkInterfaceType == NetworkInterfaceType.GigabitEthernet));
     199
     200      if (validNic == default(NetworkInterface)) {
     201        validNic = NetworkInterface.GetAllNetworkInterfaces().First();
     202      }
     203
     204      byte[] addr = validNic.GetPhysicalAddress().GetAddressBytes();
     205      if (addr.Length < macLength || addr.Length > macLongLength) {
     206        throw new ArgumentException(string.Format("Error generating slave UID: MAC address has to have a length between {0} and {1} bytes. Actual MAC address is: {2}",
     207              macLength, macLongLength, addr));
     208      }
     209
     210      if (addr.Length < macLongLength) {
     211        byte[] b = new byte[8];
     212        Array.Copy(addr, 0, b, 2, addr.Length);
     213        addr = b;
     214      }
     215
     216      // also get machine name and save it to the first 4 bytes               
     217      Guid guid = new Guid(Environment.MachineName.GetHashCode(), 0, 0, addr);
     218      return guid;
    232219    }
    233220
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/EventLogManager.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    113113      string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
    114114      CopyFile(baseDir, targetDir, CoreProperties.Settings.Default.PluginInfrastructureDll);
    115       CopyFile(baseDir, targetDir, CoreProperties.Settings.Default.SharpZipLibDll);
    116       CopyFile(baseDir, targetDir, CoreProperties.Settings.Default.SharpZipLibLicense);
    117115
    118116      // copy slave plugins, otherwise its not possible to register the UnhandledException handler to the appdomain       
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/TaskManager.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/MessageQueue.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/NetworkEnum.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Plugin.cs.frame

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2828
    2929namespace HeuristicLab.Clients.Hive.SlaveCore {
    30   [Plugin("HeuristicLab.Clients.Hive.SlaveCore", "3.3.10.$WCREV$")]
     30  [Plugin("HeuristicLab.Clients.Hive.SlaveCore", "3.3.11.$WCREV$")]
    3131  [PluginFile("HeuristicLab.Clients.Hive.SlaveCore-3.3.dll", PluginFileType.Assembly)]
    3232 
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/AssemblyInfo.cs.frame

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
     
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

    r11204 r12395  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.18047
     4//     Runtime Version:4.0.30319.34014
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    1616    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
     
    8686        [global::System.Configuration.UserScopedSettingAttribute()]
    8787        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    88         [global::System.Configuration.DefaultSettingValueAttribute("ICSharpCode.SharpZipLib.dll")]
    89         public string SharpZipLibDll {
    90             get {
    91                 return ((string)(this["SharpZipLibDll"]));
    92             }
    93             set {
    94                 this["SharpZipLibDll"] = value;
    95             }
    96         }
    97        
    98         [global::System.Configuration.UserScopedSettingAttribute()]
    99         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    100         [global::System.Configuration.DefaultSettingValueAttribute("ICSharpCode.SharpZipLib License.txt")]
    101         public string SharpZipLibLicense {
    102             get {
    103                 return ((string)(this["SharpZipLibLicense"]));
    104             }
    105             set {
    106                 this["SharpZipLibLicense"] = value;
    107             }
    108         }
    109        
    110         [global::System.Configuration.UserScopedSettingAttribute()]
    111         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    11288        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore-3.3.dll")]
    11389        public string ClientsHiveSlaveCoreDll {
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

    r11204 r12395  
    1717    <Setting Name="PluginInfrastructureDll" Type="System.String" Scope="User">
    1818      <Value Profile="(Default)">HeuristicLab.PluginInfrastructure-3.3.dll</Value>
    19     </Setting>
    20     <Setting Name="SharpZipLibDll" Type="System.String" Scope="User">
    21       <Value Profile="(Default)">ICSharpCode.SharpZipLib.dll</Value>
    22     </Setting>
    23     <Setting Name="SharpZipLibLicense" Type="System.String" Scope="User">
    24       <Value Profile="(Default)">ICSharpCode.SharpZipLib License.txt</Value>
    2519    </Setting>
    2620    <Setting Name="ClientsHiveSlaveCoreDll" Type="System.String" Scope="User">
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/ServiceContracts/ISlaveCommunication.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/ServiceContracts/ISlaveCommunicationCallbacks.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveClientCom.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveCommunicationService.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveStatusInfo.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/StatusCommons.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/TaskStatus.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs

    r11204 r12395  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r11204 r12395  
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5       <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    6       <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     6      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
    77    </sectionGroup>
    88  </configSections>
    99  <runtime>
    10     <gcServer enabled="true" />
     10    <gcServer enabled="true"/>
    1111  </runtime>
    1212
    1313  <startup>
    14     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     14    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
    1515  </startup>
    1616 
     
    2626      <wsHttpBinding>
    2727        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    28           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    29           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     28          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     29          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    3030          <security mode="Message">
    31             <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
    32             <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default" />
     31            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
     32            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
    3333          </security>
    3434        </binding>
     
    3636      <netTcpBinding>
    3737        <binding name="netTcpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    38           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    39           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     38          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     39          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    4040          <security mode="TransportWithMessageCredential">
    41             <transport clientCredentialType="Windows" />
    42             <message clientCredentialType="UserName" algorithmSuite="Default" />
     41            <transport clientCredentialType="Windows"/>
     42            <message clientCredentialType="UserName" algorithmSuite="Default"/>
    4343          </security>
    4444        </binding>
     
    5252    <client>
    5353      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    54       <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
     54      <endpoint address="http://localhost/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    5555        <identity>
    56           <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU="/>
     56          <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/>
    5757        </identity>
    5858      </endpoint>
    59       <endpoint address="net.tcp://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
     59      <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    6060        <identity>
    61           <certificate encodedValue="AwAAAAEAAAAUAAAAbXPHlcY5JfZJhlUcEnbLsIbyDjEgAAAAAQAAAPcCAAAwggLzMIIB36ADAgECAhD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEzMDQwNDEyMTIwNloXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4RPzrf4LoNl4gvTpgRP6JM1OIr+KtIJbmI8X4U9aKeMuwhxrxM7qCwfDWSY7jXAcmeBNXthgmmiqWf+Nz1J0zRUfPwTJA9D6qkvjwEIiHIEwt3lUeHEOXKY75RaDQo/SKgGj9odLmVUlBqSXIxZNyxBWFCNpeeKVF06CvJ+0Ha+Z+htvPVGXds7G6w/Q1yyHO0KKeNuzsYQVGPrJVkNTWJrsDqCv5XehqrrPMQhDnLKC2epH4qZA9Q159i4HqyxMvpoiaFVBAWOKqsHdkpUBE+oaB0FSHqK5k+by/lInzTHxLDG5QQwxy5zZjlkFnUR7hEFifh/oo48R4jc7J2mPSwIDAQABo0kwRzBFBgNVHQEEPjA8gBDH8MN7gcWXXxlsL7KWZte7oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghD7poiOgHRvm0fmBwBdcSX6MAkGBSsOAwIdBQADggEBANrNxHpB2qA9j9/N+wzCJMJowkY1aGtknf/1eM+tfhv0RgmobZwm5cIu7srzV6R5OPpvNzzZjBgyOQxvzZsBt0XwFhKg9RClQL8OVX7EL2XRnlwQ+dTunCDNKGQs9cHUKcvZMLOESMcqN9hfEkRENaoscMpWjdztueXIha9IPp/ZxcmpKlH9fJPnAKMy9NhtI0BBNUY1xRQNUeu3y1oAgwWDG6zad1rJ5eAS6PByny+DHiFjLsmsm/nFRY8nSaE+2tXs56p/CLJSxmbuF5AsyfSJ1SlP/e5YgYQDWkMEx5NdcQu1dRdhnZLalrGTb6pIoj2HfOw2UMVMKLLWp+DvBPU=" />
     61          <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9" />
    6262        </identity>
    6363      </endpoint>
     
    8383      <setting name="PluginInfrastructureDll" serializeAs="String">
    8484        <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
    85       </setting>
    86       <setting name="SharpZipLibDll" serializeAs="String">
    87         <value>ICSharpCode.SharpZipLib.dll</value>
    88       </setting>
    89       <setting name="SharpZipLibLicense" serializeAs="String">
    90         <value>ICSharpCode.SharpZipLib License.txt</value>
    9185      </setting>
    9286      <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
     
    166160      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
    167161        <value>
    168           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    169             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     162          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    170163            <string>netTcpBinding_IHiveService</string>
    171164            <string>wsHttpBinding_IHiveService</string>
Note: See TracChangeset for help on using the changeset viewer.