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:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

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

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3.csproj

    r8600 r12395  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.SlaveCore.ConsoleClient</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4</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>
    … …  
    114120  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    115121  <PropertyGroup>
    116    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     122    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    117123set ProjectDir=$(ProjectDir)
    118124set SolutionDir=$(SolutionDir)
    … …  
    120126
    121127call PreBuildEvent.cmd</PreBuildEvent>
    122 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     128    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    123129export ProjectDir=$(ProjectDir)
    124130export SolutionDir=$(SolutionDir)

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.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.ConsoleClient/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.ConsoleClient/3.3/SlaveCommListener.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.ConsoleClient/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 
    … …  
    2222      <wsHttpBinding>
    2323        <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">
    24           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    25           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     24          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     25          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    2626          <security mode="Message">
    27             <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
    28             <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default" />
     27            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
     28            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
    2929          </security>
    3030        </binding>
    … …  
    3232      <netTcpBinding>
    3333        <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">
    34           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    35           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     34          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     35          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    3636          <security mode="TransportWithMessageCredential">
    37             <transport clientCredentialType="Windows" />
    38             <message clientCredentialType="UserName" algorithmSuite="Default" />
     37            <transport clientCredentialType="Windows"/>
     38            <message clientCredentialType="UserName" algorithmSuite="Default"/>
    3939          </security>
    4040        </binding>
    … …  
    5050   <client>
    5151     <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    52     <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc"
     52    <endpoint address="http://localhost/Hive-3.3/HiveService.svc"
    5353              binding="wsHttpBinding"
    5454              bindingConfiguration="wsHttpBinding_Hive"
    … …  
    5656              name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    5757      <identity>
    58         <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=" />
     58      <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9" />
    5959      </identity>
    6060    </endpoint>
    61      <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">
     61     <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">
    6262       <identity>
    63          <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=" />
     63       <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9" />
    6464       </identity>
    6565     </endpoint>
    … …  
    8484      <setting name="PluginInfrastructureDll" serializeAs="String">
    8585        <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
    86       </setting>
    87       <setting name="SharpZipLibDll" serializeAs="String">
    88         <value>ICSharpCode.SharpZipLib.dll</value>
    89       </setting>
    90       <setting name="SharpZipLibLicense" serializeAs="String">
    91         <value>ICSharpCode.SharpZipLib License.txt</value>
    9286      </setting>
    9387      <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
    … …  
    167161      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
    168162        <value>
    169           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    170             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     163          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    171164            <string>netTcpBinding_IHiveService</string>
    172165            <string>wsHttpBinding_IHiveService</string>
    … …  
    179172    </HeuristicLab.Clients.Hive.Settings>
    180173  </userSettings>
    181 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
     174<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.