Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10451 for stable


Ignore:
Timestamp:
02/11/14 09:55:31 (11 years ago)
Author:
ascheibe
Message:

#2113 merged changes into stable

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config

    r9700 r10451  
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    55      <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" />
    67    </sectionGroup>
    78  </configSections>
    89  <runtime>
    910    <gcServer enabled="true" />
    10   </runtime>
     11  </runtime>     
    1112 
    1213  <system.serviceModel>
    … …  
    6263   
    6364 </system.serviceModel>
    64  
     65
    6566  <userSettings>
    6667    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    67       <setting name="HeartbeatInterval" serializeAs="String">
    68         <value>00:00:20</value>
    69       </setting>
    7068      <setting name="LastUsedFileName" serializeAs="String">
    7169        <value>lastUsed.dat</value>
    … …  
    135133      </setting>
    136134      <setting name="NrOfCoresToScavenge" serializeAs="String">
    137         <value>2</value>
     135        <value>-1</value>
    138136      </setting>
    139137      <setting name="ShutdownCommand" serializeAs="String">
    140138        <value>shutdown.exe</value>
    141139      </setting>
    142    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     140      <setting name="HeartbeatInterval" serializeAs="String">
     141        <value>00:00:40</value>
     142      </setting>
     143    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     144    <HeuristicLab.Clients.Hive.Settings>
     145      <setting name="MaxParallelUploads" serializeAs="String">
     146        <value>2</value>
     147      </setting>
     148      <setting name="HLBinaryName" serializeAs="String">
     149        <value>HeuristicLab 3.3.exe</value>
     150      </setting>
     151      <setting name="ResultPollingInterval" serializeAs="String">
     152        <value>00:00:20</value>
     153      </setting>
     154      <setting name="MaxParallelDownloads" serializeAs="String">
     155        <value>2</value>
     156      </setting>
     157      <setting name="MaxRepeatServiceCalls" serializeAs="String">
     158        <value>5</value>
     159      </setting>
     160      <setting name="AnonymousUserName" serializeAs="String">
     161        <value>anonymous</value>
     162      </setting>
     163      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
     164        <value>
     165          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     166            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     167            <string>netTcpBinding_IHiveService</string>
     168            <string>wsHttpBinding_IHiveService</string>
     169          </ArrayOfString>
     170        </value>
     171      </setting>
     172      <setting name="MaxEndpointRetries" serializeAs="String">
     173        <value>3</value>
     174      </setting>
     175    </HeuristicLab.Clients.Hive.Settings>
    143176  </userSettings>
    144177<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

  • stable/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/HeuristicLab.Clients.Hive.Slave.WindowsService-3.3.csproj

    r8600 r10451  
    154154  </ItemGroup>
    155155  <ItemGroup>
    156     <None Include="app.config" />
     156    <None Include="app.config">
     157      <SubType>Designer</SubType>
     158    </None>
    157159  </ItemGroup>
    158160  <ItemGroup>
    … …  
    164166  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    165167  <PropertyGroup>
    166    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     168    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    167169set ProjectDir=$(ProjectDir)
    168170set SolutionDir=$(SolutionDir)
    … …  
    170172
    171173call PreBuildEvent.cmd</PreBuildEvent>
    172 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     174    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    173175export ProjectDir=$(ProjectDir)
    174176export SolutionDir=$(SolutionDir)

  • stable/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config

    r9700 r10451  
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    55      <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" />
    67    </sectionGroup>
    78  </configSections>
    … …  
    1112
    1213  <system.serviceModel>
     14    <behaviors>
     15      <endpointBehaviors>
     16        <behavior name="HiveBehaviorConfiguration">
     17          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
     18        </behavior>
     19      </endpointBehaviors>
     20    </behaviors>
    1321    <bindings>
    1422      <wsHttpBinding>
    … …  
    4250    <client>
    4351      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    44       <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
     52      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    4553        <identity>
    4654          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
    … …  
    5866  <userSettings>
    5967    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    60       <setting name="HeartbeatInterval" serializeAs="String">
    61         <value>00:00:60</value>
    62       </setting>
    6368      <setting name="LastUsedFileName" serializeAs="String">
    6469        <value>lastUsed.dat</value>
    … …  
    133138        <value>shutdown.exe</value>
    134139      </setting>
     140      <setting name="HeartbeatInterval" serializeAs="String">
     141        <value>00:00:40</value>
     142      </setting>
    135143    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     144    <HeuristicLab.Clients.Hive.Settings>
     145      <setting name="MaxParallelUploads" serializeAs="String">
     146        <value>2</value>
     147      </setting>
     148      <setting name="HLBinaryName" serializeAs="String">
     149        <value>HeuristicLab 3.3.exe</value>
     150      </setting>
     151      <setting name="ResultPollingInterval" serializeAs="String">
     152        <value>00:00:20</value>
     153      </setting>
     154      <setting name="MaxParallelDownloads" serializeAs="String">
     155        <value>2</value>
     156      </setting>
     157      <setting name="MaxRepeatServiceCalls" serializeAs="String">
     158        <value>5</value>
     159      </setting>
     160      <setting name="AnonymousUserName" serializeAs="String">
     161        <value>anonymous</value>
     162      </setting>
     163      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
     164        <value>
     165          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     166            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     167            <string>netTcpBinding_IHiveService</string>
     168            <string>wsHttpBinding_IHiveService</string>
     169          </ArrayOfString>
     170        </value>
     171      </setting>
     172      <setting name="MaxEndpointRetries" serializeAs="String">
     173        <value>3</value>
     174      </setting>
     175    </HeuristicLab.Clients.Hive.Settings>
    136176  </userSettings>
    137177 

  • stable/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r9700 r10451  
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    55      <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" />
    67    </sectionGroup>
    78  </configSections>
    … …  
    141142      </setting>
    142143    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     144    <HeuristicLab.Clients.Hive.Settings>
     145      <setting name="MaxParallelUploads" serializeAs="String">
     146        <value>2</value>
     147      </setting>
     148      <setting name="HLBinaryName" serializeAs="String">
     149        <value>HeuristicLab 3.3.exe</value>
     150      </setting>
     151      <setting name="ResultPollingInterval" serializeAs="String">
     152        <value>00:00:20</value>
     153      </setting>
     154      <setting name="MaxParallelDownloads" serializeAs="String">
     155        <value>2</value>
     156      </setting>
     157      <setting name="MaxRepeatServiceCalls" serializeAs="String">
     158        <value>5</value>
     159      </setting>
     160      <setting name="AnonymousUserName" serializeAs="String">
     161        <value>anonymous</value>
     162      </setting>
     163      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
     164        <value>
     165          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     166            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     167            <string>netTcpBinding_IHiveService</string>
     168            <string>wsHttpBinding_IHiveService</string>
     169          </ArrayOfString>
     170        </value>
     171      </setting>
     172      <setting name="MaxEndpointRetries" serializeAs="String">
     173        <value>3</value>
     174      </setting>
     175    </HeuristicLab.Clients.Hive.Settings>
    143176  </userSettings>
    144177</configuration>
Note: See TracChangeset for help on using the changeset viewer.