Changeset 4710


Ignore:
Timestamp:
11/02/10 16:59:22 (9 years ago)
Author:
cneumuel
Message:

#1254

  • enabled full IIS7 compatibility
  • removed dependency to HeuristicLab.Tracing
  • changed server-side logging to wcf-tracing (needs to be enhanced to trace job-lifecycle)
Location:
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive
Files:
2 added
5 deleted
59 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive

    • Property svn:ignore
      •  

        old new  
        11*.suo
        22HeuristicLab.Hive.Server.Tests
         3PrecompiledWeb
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs

    r4629 r4710  
    5858// [assembly: AssemblyVersion("1.0.*")]
    5959[assembly: AssemblyVersion("3.3.0.0")]
    60 [assembly: AssemblyFileVersion("3.3.0.4598")]
     60[assembly: AssemblyFileVersion("3.3.0.4629")]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4629 r4710  
    8282Project("{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}"
    8383EndProject
    84 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HiveWeb", "..\..\..\..\..\Web\HiveWeb\", "{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}"
     84Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HiveWeb", "HiveWeb\", "{590AD383-846B-48FF-8D06-B0AA1B328102}"
    8585  ProjectSection(WebsiteProperties) = preProject
    8686    TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
     87    ProjectReferences = "{134F93D7-E7C8-4ECD-9923-7F63259A60D8}|HeuristicLab.Hive.Contracts-3.3.dll;{9076697B-C151-46CD-95BC-1D059492B478}|HeuristicLab.DataAccess-3.3.dll;{21187322-52DD-4243-80A4-A85F0263E63B}|HeuristicLab.Hive.JobBase-3.3.dll;{898B31CF-81DC-453B-AEB3-BDF83197A7EE}|HeuristicLab.Hive.Server.Core-3.3.dll;{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}|HeuristicLab.Hive.Server.DataAccess-3.3.dll;{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}|HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll;{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}|HeuristicLab.Hive.Tracing-3.3.dll;"
    8788    Debug.AspNetCompiler.VirtualPath = "/HiveWeb"
    88     Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\"
     89    Debug.AspNetCompiler.PhysicalPath = "HiveWeb\"
    8990    Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\"
    9091    Debug.AspNetCompiler.Updateable = "true"
     
    9394    Debug.AspNetCompiler.Debug = "True"
    9495    Release.AspNetCompiler.VirtualPath = "/HiveWeb"
    95     Release.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\"
     96    Release.AspNetCompiler.PhysicalPath = "HiveWeb\"
    9697    Release.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\"
    9798    Release.AspNetCompiler.Updateable = "true"
     
    99100    Release.AspNetCompiler.FixedNames = "false"
    100101    Release.AspNetCompiler.Debug = "False"
    101     VWDPort = "2681"
     102    VWDPort = "3220"
    102103  EndProjectSection
    103104EndProject
     
    392393    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
    393394    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
    394     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    395     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.Build.0 = Debug|Any CPU
    396     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    397     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    398     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x64.ActiveCfg = Debug|Any CPU
    399     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x86.ActiveCfg = Debug|Any CPU
    400     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.ActiveCfg = Debug|Any CPU
    401     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.Build.0 = Debug|Any CPU
    402     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
    403     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
    404     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x64.ActiveCfg = Debug|Any CPU
    405     {F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x86.ActiveCfg = Debug|Any CPU
     395    {590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     396    {590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Any CPU.Build.0 = Debug|Any CPU
     397    {590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     398    {590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     399    {590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|x64.ActiveCfg = Debug|Any CPU
     400    {590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|x86.ActiveCfg = Debug|Any CPU
     401    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Any CPU.ActiveCfg = Debug|Any CPU
     402    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Any CPU.Build.0 = Debug|Any CPU
     403    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
     404    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
     405    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|x64.ActiveCfg = Debug|Any CPU
     406    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|x86.ActiveCfg = Debug|Any CPU
    406407  EndGlobalSection
    407408  GlobalSection(SolutionProperties) = preSolution
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4557 r4710  
    1919    <OldToolsVersion>3.5</OldToolsVersion>
    2020    <UpgradeBackupLocation />
     21    <TargetFrameworkProfile />
    2122  </PropertyGroup>
    2223  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    9091    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    9192      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    92     </Reference>
    93     <Reference Include="HeuristicLab.Tracing-3.3">
    94       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9593    </Reference>
    9694    <Reference Include="System" />
     
    180178      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    181179    </ProjectReference>
     180    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     181      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     182      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     183    </ProjectReference>
    182184  </ItemGroup>
    183185  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLabHiveContractsPlugin.cs

    r4424 r4710  
    2828  [PluginDependency("HeuristicLab.Core", "3.3")]
    2929  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
     30  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3031  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    31   [PluginDependency("HeuristicLab.Tracing", "3.3")]
    3232  public class HeuristicLabHiveContractsPlugin : PluginBase {
    3333  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs

    r4424 r4710  
    2323using System.ServiceModel;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Tracing;
     25using HeuristicLab.Hive.Tracing;
    2626
    2727namespace HeuristicLab.Hive.Contracts {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfSettings.cs

    r4424 r4710  
    2626using System.ServiceModel.Channels;
    2727using System.ServiceModel.Description;
    28 using HeuristicLab.Tracing;
     28using HeuristicLab.Hive.Tracing;
    2929
    3030namespace HeuristicLab.Hive.Contracts {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs

    r4423 r4710  
    405405    private System.Windows.Forms.Button disconnectButton;
    406406    private System.Windows.Forms.Button reconnectButton;
    407     protected System.Windows.Forms.Button openExperimentButton;
    408     protected System.Windows.Forms.Button newExperimentButton;
     407    private System.Windows.Forms.Button openExperimentButton;
     408    private System.Windows.Forms.Button newExperimentButton;
    409409    private System.Windows.Forms.TabPage jobsTabPage;
    410410    private System.Windows.Forms.Button downloadExperimentButton;
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/Resources.Designer.cs

    r4424 r4710  
    1010
    1111namespace HeuristicLab.Hive.Experiment.Views.Properties {
    12 
    13 
    14   /// <summary>
     12    using System;
     13   
     14   
     15    /// <summary>
    1516    ///   A strongly-typed resource class, for looking up localized strings, etc.
    1617    /// </summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj

    r4557 r4710  
    104104      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    105105    </Reference>
    106     <Reference Include="HeuristicLab.Tracing-3.3">
    107       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    108     </Reference>
    109106    <Reference Include="System" />
    110107    <Reference Include="System.Core" />
     
    168165      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    169166    </ProjectReference>
     167    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     168      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     169      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     170    </ProjectReference>
    170171  </ItemGroup>
    171172  <ItemGroup>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLabHiveExperimentPlugin.cs

    r4424 r4710  
    3636  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    3737  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
     38  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3839  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3940  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    40   [PluginDependency("HeuristicLab.Tracing", "3.3")]
    4141  public class HeuristicLabHiveExperimentPlugin : PluginBase {
    4242
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

    r4557 r4710  
    3131using HeuristicLab.Hive.Contracts.ResponseObjects;
    3232using HeuristicLab.Hive.Experiment.Jobs;
    33 using HeuristicLab.Tracing;
     33using HeuristicLab.Hive.Tracing;
    3434
    3535namespace HeuristicLab.Hive.Experiment {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/app.config

    r4423 r4710  
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5       <section name="HeuristicLab.Hive.Experiment.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Hive.Experiment.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66    </sectionGroup>
    77  </configSections>
     
    2929    <bindings>
    3030      <netTcpBinding>
    31         <binding name="ClientTcpStreamedEndpoint" closeTimeout="00:01:00"
    32             openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    33             transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions"
    34             hostNameComparisonMode="StrongWildcard" listenBacklog="10"
    35             maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10"
    36             maxReceivedMessageSize="104857600">
    37           <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600"
    38               maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    39           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    40               enabled="false" />
     31        <binding name="ClientTcpStreamedEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
     32          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
     33          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    4134          <security mode="TransportWithMessageCredential">
    42             <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
    43             <message clientCredentialType="UserName" algorithmSuite="Default" />
     35            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign"/>
     36            <message clientCredentialType="UserName" algorithmSuite="Default"/>
    4437          </security>
    4538        </binding>
    4639      </netTcpBinding>
    4740      <wsHttpBinding>
    48         <binding name="ClientHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
    49             receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
    50             transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    51             maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
    52             messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
    53             allowCookies="false">
    54           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    55               maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    56           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    57               enabled="false" />
     41        <binding name="ClientHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     42          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
     43          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    5844          <security mode="Message">
    59             <transport clientCredentialType="Windows" proxyCredentialType="None"
    60                 realm="" />
    61             <message clientCredentialType="UserName" negotiateServiceCredential="true"
    62                 algorithmSuite="Default" />
     45            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
     46            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
    6347          </security>
    6448        </binding>
     
    6650    </bindings>
    6751    <client>
    68       <endpoint address="net.tcp://blade12.hpc.fh-hagenberg.at:9001/ClientServiceStreamed" behaviorConfiguration="ClientServiceBehaviour"
    69           binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint"
    70           contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
     52      <endpoint address="net.tcp://localhost:9001/Hive/ClientService.svc" behaviorConfiguration="ClientServiceBehaviour" binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
    7153        <identity>
    72           <dns value="blade12.hpc.fh-hagenberg.at" />
     54          <dns value="localhost"/>
    7355        </identity>
    7456      </endpoint>
    75       <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/ClientService" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour"
    76           bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"
    77           name="ClientHttpEndpoint">
     57      <endpoint address="http://localhost:9000/Hive/ClientService.svc" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour" bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientHttpEndpoint">
    7858        <identity>
    79           <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
     59          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
    8060        </identity>
    8161      </endpoint>
     
    8767          <clientCredentials>
    8868            <serviceCertificate>
    89               <authentication certificateValidationMode="None" />
     69              <authentication certificateValidationMode="None"/>
    9070            </serviceCertificate>
    9171          </clientCredentials>
     
    9575
    9676  </system.serviceModel>
    97 </configuration>
     77<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj

    r4368 r4710  
    3434    <UseApplicationTrust>false</UseApplicationTrust>
    3535    <BootstrapperEnabled>true</BootstrapperEnabled>
     36    <TargetFrameworkProfile />
    3637  </PropertyGroup>
    3738  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj

    r4302 r4710  
    2121    <OldToolsVersion>3.5</OldToolsVersion>
    2222    <UpgradeBackupLocation />
     23    <TargetFrameworkProfile />
    2324  </PropertyGroup>
    2425  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    8990    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    9091      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    91     </Reference>
    92     <Reference Include="HeuristicLab.Tracing-3.3">
    93       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9492    </Reference>
    9593    <Reference Include="System" />
     
    263261      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    264262    </ProjectReference>
     263    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     264      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     265      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     266    </ProjectReference>
    265267  </ItemGroup>
    266268  <ItemGroup>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLabHiveClientConsolePlugin.cs

    r4424 r4710  
    3131  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    3232  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
     33  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3334  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    34   [PluginDependency("HeuristicLab.Tracing", "3.3")]
    3535  public class HeuristicLabHiveSlaveConsolePlugin : PluginBase {
    3636  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Properties/Resources.Designer.cs

    r4424 r4710  
    1010
    1111namespace HeuristicLab.Hive.Server.ServerConsole.Properties {
    12 
    13 
    14   /// <summary>
     12    using System;
     13   
     14   
     15    /// <summary>
    1516    ///   A strongly-typed resource class, for looking up localized strings, etc.
    1617    /// </summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/app.config

    r4423 r4710  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <system.serviceModel>
     
    77          <clientCredentials>
    88            <serviceCertificate>
    9               <authentication certificateValidationMode="None" />
     9              <authentication certificateValidationMode="None"/>
    1010            </serviceCertificate>
    1111          </clientCredentials>
     
    1515    <bindings>
    1616      <wsHttpBinding>
    17         <binding name="ServerConsoleHttpEndpoint" closeTimeout="00:01:00"
    18             openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    19             bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    20             maxBufferPoolSize="524288" maxReceivedMessageSize="104857600"
    21             messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
    22             allowCookies="false">
    23           <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600"
    24               maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    25           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    26               enabled="false" />
     17        <binding name="ServerConsoleHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="104857600" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     18          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
     19          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    2720          <security mode="Message">
    28             <transport clientCredentialType="Windows" proxyCredentialType="None"
    29                 realm="" />
    30             <message clientCredentialType="UserName" negotiateServiceCredential="true"
    31                 algorithmSuite="Default" />
     21            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
     22            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
    3223          </security>
    3324        </binding>
     
    3526    </bindings>
    3627    <client>
    37       <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService" behaviorConfiguration="ServerConsoleBehaviour"
    38           binding="wsHttpBinding" bindingConfiguration="ServerConsoleHttpEndpoint"
    39           contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleHttpEndpoint">
     28      <endpoint address="http://localhost:9000/Hive/ServerConsoleService.svc" behaviorConfiguration="ServerConsoleBehaviour" binding="wsHttpBinding" bindingConfiguration="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleHttpEndpoint">
    4029        <identity>
    41           <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
     30          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
    4231        </identity>
    4332      </endpoint>
    4433    </client>
    4534  </system.serviceModel>
    46 </configuration>
     35<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

    r4629 r4710  
    2020    <OldToolsVersion>3.5</OldToolsVersion>
    2121    <UpgradeBackupLocation />
     22    <TargetFrameworkProfile />
    2223  </PropertyGroup>
    2324  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    8990      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    9091    </Reference>
    91     <Reference Include="HeuristicLab.Tracing-3.3">
    92       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    93     </Reference>
    9492    <Reference Include="System" />
    9593    <Reference Include="System.Core">
     
    106104    <Reference Include="System.Transactions" />
    107105    <Reference Include="System.Web" />
     106    <Reference Include="System.Web.ApplicationServices" />
    108107    <Reference Include="System.Windows.Forms" />
    109108    <Reference Include="System.Xml.Linq">
     
    164163      <Project>{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}</Project>
    165164      <Name>HeuristicLab.Hive.Server.LINQDataAccess-3.3</Name>
     165    </ProjectReference>
     166    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     167      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     168      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
    166169    </ProjectReference>
    167170  </ItemGroup>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLabHiveServerCorePlugin.cs

    r4424 r4710  
    3131  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
    3232  [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
    33   [PluginDependency("HeuristicLab.Tracing", "3.3")]
     33  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3434  public class HeuristicLabHiveServerCorePlugin : PluginBase {
    3535  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

    r4424 r4710  
    3232using HeuristicLab.Hive.Server.Core.InternalInterfaces;
    3333using HeuristicLab.Hive.Server.DataAccess;
    34 using HeuristicLab.Tracing;
     34using HeuristicLab.Hive.Tracing;
    3535
    3636namespace HeuristicLab.Hive.Server.Core {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/LifecycleManager.cs

    r4424 r4710  
    2323using System.Threading;
    2424using HeuristicLab.Hive.Contracts.Interfaces;
    25 using HeuristicLab.Tracing;
     25using HeuristicLab.Hive.Tracing;
    2626
    2727namespace HeuristicLab.Hive.Server.Core {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs

    r4424 r4710  
    8989    public static ILifecycleManager GetLifecycleManager() {
    9090      if (lifecycleManager == null) {
    91         lifecycleManager = ApplicationManager.Manager.GetInstances<ILifecycleManager>().First();
     91        //lifecycleManager = ApplicationManager.Manager.GetInstances<ILifecycleManager>().First();
     92        lifecycleManager = new LifecycleManager();
    9293      }
    9394      return lifecycleManager;
     
    101102    public static IScheduler GetScheduler() {
    102103      if (scheduler == null) {
    103         scheduler = ApplicationManager.Manager.GetInstances<IScheduler>().First();
     104        //scheduler = ApplicationManager.Manager.GetInstances<IScheduler>().First();
     105        scheduler = new DefaultScheduler();
    104106      }
    105107
     
    113115    [MethodImpl(MethodImplOptions.Synchronized)]
    114116    public static IAuthorizationManager GetAuthorizationManager() {
    115       if (authorizationManager == null)
    116         authorizationManager = ApplicationManager.Manager.GetInstances<IAuthorizationManager>().First();
     117      if (authorizationManager == null) {
     118        //authorizationManager = ApplicationManager.Manager.GetInstances<IAuthorizationManager>().First();
     119        authorizationManager = new Authorization.AuthorizationManager();
     120      }
    117121      return authorizationManager;
    118122    }
     
    124128    [MethodImpl(MethodImplOptions.Synchronized)]
    125129    public static IContextFactory GetContextFactory() {
    126       if (contextFactory == null)
    127         contextFactory = ApplicationManager.Manager.GetInstances<IContextFactory>().First();
     130      if (contextFactory == null) {
     131        //contextFactory = ApplicationManager.Manager.GetInstances<IContextFactory>().First();
     132        contextFactory = new HeuristicLab.Hive.Server.LINQDataAccess.ContextFactory();
     133      }
    128134      return contextFactory;
    129135    }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

    r4424 r4710  
    3333using HeuristicLab.Hive.Server.Core.InternalInterfaces;
    3434using HeuristicLab.PluginInfrastructure;
    35 using HeuristicLab.Tracing;
     35using System.Diagnostics;
     36using HeuristicLab.Hive.Tracing;
    3637
    3738namespace HeuristicLab.Hive.Server.Core {
     
    9091        Logger.Debug("Server Heartbeat ticked");
    9192        List<Guid> slaveIds = DaoLocator.SlaveDao.FindAll().Select(s => s.Id).ToList();
    92 
    9393        foreach (Guid slaveId in slaveIds) {
    9494          using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config

    r4629 r4710  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <system.diagnostics>
     
    66        <listeners>
    77          <add type="System.Diagnostics.DefaultTraceListener" name="Default">
    8             <filter type="" />
     8            <filter type=""/>
    99          </add>
    1010          <add name="ServiceModelMessageLoggingListener">
    11             <filter type="" />
     11            <filter type=""/>
    1212          </add>
    1313        </listeners>
    1414      </source>
    15       <source name="System.ServiceModel" switchValue="Warning, ActivityTracing"
    16         propagateActivity="true">
     15      <source name="System.ServiceModel" switchValue="Warning, ActivityTracing" propagateActivity="true">
    1716        <listeners>
    1817          <add type="System.Diagnostics.DefaultTraceListener" name="Default">
    19             <filter type="" />
     18            <filter type=""/>
    2019          </add>
    2120          <add name="ServiceModelTraceListener">
    22             <filter type="" />
     21            <filter type=""/>
    2322          </add>
    2423        </listeners>
     
    2625    </sources>
    2726    <sharedListeners>
    28       <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_messages.svclog"
    29         type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
    30         name="ServiceModelMessageLoggingListener" traceOutputOptions="Timestamp">
    31         <filter type="" />
     27      <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_messages.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModelMessageLoggingListener" traceOutputOptions="Timestamp">
     28        <filter type=""/>
    3229      </add>
    33       <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_tracelog.svclog"
    34         type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
    35         name="ServiceModelTraceListener" traceOutputOptions="Timestamp">
    36         <filter type="" />
     30      <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_tracelog.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModelTraceListener" traceOutputOptions="Timestamp">
     31        <filter type=""/>
    3732      </add>
    3833    </sharedListeners>
    3934  </system.diagnostics>
    4035  <connectionStrings>
    41     <add name="HeuristicLab.Authentication"
    42          connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
     36    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
    4337  </connectionStrings>
    4438
     
    4741      <providers>
    4842        <clear/>
    49         <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
    50              enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
    51              maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
    52              applicationName="HeuristicLab.Authentication" />
     43        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
    5344      </providers>
    5445    </membership>
     
    5748      <providers>
    5849        <clear/>
    59         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
     50        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
    6051      </providers>
    6152    </roleManager>
     
    6455  <system.serviceModel>
    6556    <diagnostics>
    66       <messageLogging logEntireMessage="true" logMalformedMessages="true"
    67         logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true"
    68         maxMessagesToLog="3000" />
     57      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
    6958    </diagnostics>
    7059    <bindings>
    7160      <netTcpBinding>
    72         <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed"
    73           maxBufferPoolSize="104857600" maxBufferSize="104857600"
    74           maxReceivedMessageSize="104857600" maxConnections="50">
    75           <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
     61        <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed" maxBufferPoolSize="104857600" maxBufferSize="104857600" maxReceivedMessageSize="104857600" maxConnections="50">
     62          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600"/>
    7663          <security mode="TransportWithMessageCredential">
    7764            <transport clientCredentialType="Certificate"/>
    78             <message clientCredentialType="UserName" />
     65            <message clientCredentialType="UserName"/>
    7966          </security>
    8067        </binding>
     
    8471          <security mode="Message">
    8572            <transport/>
    86             <message clientCredentialType="UserName" />
     73            <message clientCredentialType="UserName"/>
    8774          </security>
    8875        </binding>
     
    9279      <serviceBehaviors>
    9380        <behavior name="ServiceBehaviour">
    94           <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
    95           <serviceDebug includeExceptionDetailInFaults="true" />
    96           <serviceAuthorization principalPermissionMode="UseAspNetRoles"
    97             roleProviderName="AspNetSqlRoleProvider" />
     81          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false"/>
     82          <serviceDebug includeExceptionDetailInFaults="true"/>
     83          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
    9884          <serviceCredentials>
    99             <serviceCertificate findValue="blade12.hpc.fh-hagenberg.at" x509FindType="FindBySubjectName" />
    100             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
    101               membershipProviderName="AspNetSqlMembershipProvider" />
     85            <serviceCertificate findValue="blade12.hpc.fh-hagenberg.at" x509FindType="FindBySubjectName"/>
     86            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
    10287          </serviceCredentials>
    103           <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false"
    104             messageAuthenticationAuditLevel="SuccessOrFailure" />
     88          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure"/>
    10589          <serviceThrottling maxConcurrentCalls="100"/>
    10690        </behavior>
     
    10993    <services>
    11094      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.SlaveFacade">
    111         <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
    112         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange" />
    113         <endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
     95        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade"/>
     96        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange"/>
     97        <endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade"/>
    11498        <host>
    11599          <baseAddresses>
    116             <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/SlaveService" />
    117             <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/SlaveServiceStreamed" />
     100            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/SlaveService"/>
     101            <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/SlaveServiceStreamed"/>
    118102          </baseAddresses>
    119103        </host>
    120104      </service>
    121105      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ServerConsoleFacade">
    122         <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
    123         <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange" />
     106        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade"/>
     107        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange"/>
    124108        <host>
    125109          <baseAddresses>
    126             <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService" />
     110            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService"/>
    127111          </baseAddresses>
    128112        </host>
    129113      </service>
    130114      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ClientFacade">
    131         <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
    132         <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
    133         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange" />
     115        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"/>
     116        <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"/>
     117        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange"/>
    134118        <host>
    135119          <baseAddresses>
    136             <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/ClientServiceStreamed" />
    137             <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ClientService" />
     120            <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/ClientServiceStreamed"/>
     121            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ClientService"/>
    138122          </baseAddresses>
    139123        </host>
     
    142126  </system.serviceModel>
    143127
    144 </configuration>
     128<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj

    r4423 r4710  
    2121    <OldToolsVersion>3.5</OldToolsVersion>
    2222    <UpgradeBackupLocation />
     23    <TargetFrameworkProfile />
    2324  </PropertyGroup>
    2425  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/BaseDao.cs

    r4424 r4710  
    2121
    2222using System.Data.Linq;
    23 using HeuristicLab.Tracing;
     23using HeuristicLab.Hive.Tracing;
    2424
    2525namespace HeuristicLab.Hive.Server.LINQDataAccess {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs

    r4424 r4710  
    2828using HeuristicLab.Hive.Server.DataAccess;
    2929using HeuristicLab.Hive.Server.LINQDataAccess.Properties;
    30 using HeuristicLab.Tracing;
     30using HeuristicLab.Hive.Tracing;
    3131
    3232
     
    4040  /// it has to be disposed in order to finish the corresponding transaction.
    4141  /// </summary>
    42   class ContextFactory : IContextFactory {
     42  public class ContextFactory : IContextFactory {
    4343    private static object locker = new object();
    4444    private static IDictionary<int, HiveDataContext> contexts = new Dictionary<int, HiveDataContext>();
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj

    r4423 r4710  
    1919    <OldToolsVersion>3.5</OldToolsVersion>
    2020    <UpgradeBackupLocation />
     21    <TargetFrameworkProfile />
    2122  </PropertyGroup>
    2223  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    8384      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8485    </Reference>
    85     <Reference Include="HeuristicLab.Tracing-3.3">
    86       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    87     </Reference>
    8886    <Reference Include="System" />
    8987    <Reference Include="System.Core">
     
    144142      <Name>HeuristicLab.Hive.Server.DataAccess-3.3</Name>
    145143    </ProjectReference>
     144    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     145      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     146      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     147    </ProjectReference>
    146148  </ItemGroup>
    147149  <ItemGroup>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLabHiveServerLINQDataAccessPlugin.cs

    r4424 r4710  
    2929  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    3030  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
    31   [PluginDependency("HeuristicLab.Tracing", "3.3")]
     31  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3232  public class HeuristicLabHiveServerLINQDataAccessPlugin: PluginBase {
    3333  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/VarBinaryStream.cs

    r4424 r4710  
    77using System.Data.SqlClient;
    88using System.IO;
    9 using HeuristicLab.Tracing;
     9using HeuristicLab.Hive.Tracing;
    1010
    1111namespace HeuristicLab.Hive.Server.LINQDataAccess {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/app.config

    r4302 r4710  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33    <configSections>
    44    </configSections>
    55    <connectionStrings>
    6         <add name="HeuristicLab.Hive.Server.LINQDataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
    7             connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;"
    8             providerName="System.Data.SqlClient" />
     6        <add name="HeuristicLab.Hive.Server.LINQDataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;" providerName="System.Data.SqlClient"/>
    97    </connectionStrings>
    10 </configuration>
     8<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj

    r4296 r4710  
    2121    <OldToolsVersion>3.5</OldToolsVersion>
    2222    <UpgradeBackupLocation />
     23    <TargetFrameworkProfile />
    2324  </PropertyGroup>
    2425  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    8485      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8586    </Reference>
    86     <Reference Include="HeuristicLab.Tracing-3.3">
    87       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    88     </Reference>
    8987    <Reference Include="System" />
    9088    <Reference Include="System.Core">
     
    140138      <Name>HeuristicLab.Hive.Server.Core-3.3</Name>
    141139    </ProjectReference>
     140    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     141      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     142      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     143    </ProjectReference>
    142144  </ItemGroup>
    143145  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerPlugin.cs

    r4424 r4710  
    2828  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    2929  [PluginDependency("HeuristicLab.Hive.Server.Core", "3.3")]
    30   [PluginDependency("HeuristicLab.Tracing", "3.3")]
     30  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3131  public class HeuristicLabHiveServerPlugin : PluginBase {
    3232  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj

    r4320 r4710  
    3535    <UseApplicationTrust>false</UseApplicationTrust>
    3636    <BootstrapperEnabled>true</BootstrapperEnabled>
     37    <TargetFrameworkProfile />
    3738  </PropertyGroup>
    3839  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

    r4423 r4710  
    1919    <OldToolsVersion>3.5</OldToolsVersion>
    2020    <UpgradeBackupLocation />
     21    <TargetFrameworkProfile />
    2122  </PropertyGroup>
    2223  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    8687    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    8788      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Tracing-3.3">
    90       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9189    </Reference>
    9290    <Reference Include="System" />
     
    187185      <Name>HeuristicLab.Hive.Slave.Common-3.3</Name>
    188186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     188      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     189      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     190    </ProjectReference>
    189191  </ItemGroup>
    190192  <ItemGroup>
     
    204206      <Generator>WCF Proxy Generator</Generator>
    205207      <LastGenOutput>Reference.cs</LastGenOutput>
     208      <SubType>Designer</SubType>
    206209    </None>
    207210  </ItemGroup>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLabHiveSlaveCommunicationPlugin.cs

    r4424 r4710  
    3232  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    3333  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
    34   [PluginDependency("HeuristicLab.Tracing", "3.3")]
     34  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3535  public class HeuristicLabHiveSlaveCommunicationPlugin : PluginBase {
    3636  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

    r4424 r4710  
    3232using HeuristicLab.Hive.Slave.Communication.SlaveFacade;
    3333using HeuristicLab.PluginInfrastructure;
    34 using HeuristicLab.Tracing;
     34using HeuristicLab.Hive.Tracing;
    3535
    3636namespace HeuristicLab.Hive.Slave.Communication {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config

    r4423 r4710  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5       <section name="HeuristicLab.Hive.Slave.Communication.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Hive.Slave.Communication.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66    </sectionGroup>
    77  </configSections>
     
    99    <bindings>
    1010      <netTcpBinding>
    11         <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00"
    12           openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    13           transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions"
    14           hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288"
    15           maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
    16           <readerQuotas maxDepth="32" maxStringContentLength="104857600"
    17             maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    18           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    19             enabled="false" />
     11        <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
     12          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
     13          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    2014          <security mode="TransportWithMessageCredential">
    21             <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
    22             <message clientCredentialType="UserName" algorithmSuite="Default" />
     15            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign"/>
     16            <message clientCredentialType="UserName" algorithmSuite="Default"/>
    2317          </security>
    2418        </binding>
    2519      </netTcpBinding>
    2620      <wsHttpBinding>
    27         <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
    28           receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
    29           transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    30           maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
    31           textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    32           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    33             maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    34           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    35             enabled="false" />
     21        <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     22          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
     23          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    3624          <security mode="Message">
    37             <transport clientCredentialType="Windows" proxyCredentialType="None"
    38               realm="" />
    39             <message clientCredentialType="UserName" negotiateServiceCredential="true"
    40               algorithmSuite="Default" />
     25            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
     26            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
    4127          </security>
    4228        </binding>
     
    4430    </bindings>
    4531    <client>
    46       <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/SlaveService" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour"
    47         bindingConfiguration="SlaveHttpEndpoint" contract="SlaveFacade.ISlaveFacade"
    48         name="SlaveHttpEndpoint">
     32      <endpoint address="http://localhost:9000/Hive/SlaveService.svc" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour" bindingConfiguration="SlaveHttpEndpoint" contract="SlaveFacade.ISlaveFacade" name="SlaveHttpEndpoint">
    4933        <identity>
    50           <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
     34          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
    5135        </identity>
    5236      </endpoint>
    53       <endpoint address="net.tcp://blade12.hpc.fh-hagenberg.at:9001/SlaveServiceStreamed" behaviorConfiguration="SlaveServiceBehaviour"
    54         binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint"
    55         contract="SlaveFacade.ISlaveFacade" name="SlaveTcpStreamedEndpoint">
     37      <endpoint address="net.tcp://localhost:9001/Hive/SlaveService.svc" behaviorConfiguration="SlaveServiceBehaviour" binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint" contract="SlaveFacade.ISlaveFacade" name="SlaveTcpStreamedEndpoint">
    5638        <identity>
    57           <dns value="blade12.hpc.fh-hagenberg.at" />
     39          <dns value="localhost"/>
    5840        </identity>
    5941      </endpoint>
     
    6446          <clientCredentials>
    6547            <serviceCertificate>
    66               <authentication certificateValidationMode="None" />
     48              <authentication certificateValidationMode="None"/>
    6749            </serviceCertificate>
    6850          </clientCredentials>
     
    8264    </HeuristicLab.Hive.Slave.Communication.Properties.Settings>
    8365  </userSettings>
    84 </configuration>
     66<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj

    r4320 r4710  
    2121    <OldToolsVersion>3.5</OldToolsVersion>
    2222    <UpgradeBackupLocation />
     23    <TargetFrameworkProfile />
    2324  </PropertyGroup>
    2425  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs

    r4424 r4710  
    1010
    1111namespace HeuristicLab.Hive.Slave.Console.Properties {
    12 
    13 
    14   /// <summary>
     12    using System;
     13   
     14   
     15    /// <summary>
    1516    ///   A strongly-typed resource class, for looking up localized strings, etc.
    1617    /// </summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/Reference.cs

    r4424 r4710  
    1010
    1111namespace HeuristicLab.Hive.Slave.Console.SlaveConsoleService {
    12 
    13 
    14   [System.Diagnostics.DebuggerStepThroughAttribute()]
     12    using System.Runtime.Serialization;
     13    using System;
     14   
     15   
     16    [System.Diagnostics.DebuggerStepThroughAttribute()]
    1517    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1618    [System.Runtime.Serialization.DataContractAttribute(Name="StatusCommons", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Slave.Core.SlaveConsole" +
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config

    r4337 r4710  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5       <section name="HeuristicLab.Hive.Slave.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Hive.Slave.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66    </sectionGroup>
    77  </configSections>
     
    1616    <bindings>
    1717      <netTcpBinding>
    18         <binding name="SlaveConsoleTcpEndpoint" closeTimeout="00:01:00"
    19           openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    20           transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"
    21           hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288"
    22           maxBufferSize="65536" maxReceivedMessageSize="65536">
    23           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    24             maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    25           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    26             enabled="false" />
     18        <binding name="SlaveConsoleTcpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="65536" maxReceivedMessageSize="65536">
     19          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
     20          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
    2721          <security mode="None">
    28             <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
    29             <message clientCredentialType="Windows" />
     22            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign"/>
     23            <message clientCredentialType="Windows"/>
    3024          </security>
    3125        </binding>
     
    3327    </bindings>
    3428    <client>
    35       <endpoint address="net.tcp://localhost:8000/SlaveConsoleService"
    36         binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpoint"
    37         contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpoint" />
     29      <endpoint address="net.tcp://localhost:8000/SlaveConsoleService" binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpoint" contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpoint"/>
    3830    </client>
    3931  </system.serviceModel>
    40 </configuration>
     32<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs

    r4424 r4710  
    2828using HeuristicLab.Hive.Contracts.BusinessObjects;
    2929using HeuristicLab.Hive.Contracts.ResponseObjects;
    30 using HeuristicLab.Tracing;
     30using HeuristicLab.Hive.Tracing;
    3131
    3232namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

    r4424 r4710  
    3636using HeuristicLab.Hive.Slave.Core.SlaveConsoleService;
    3737using HeuristicLab.Hive.Slave.ExecutionEngine;
    38 using HeuristicLab.Tracing;
     38using HeuristicLab.Hive.Tracing;
    3939
    4040namespace HeuristicLab.Hive.Slave.Core {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeartbeatManager.cs

    r4424 r4710  
    3030using HeuristicLab.Hive.Slave.Communication.SlaveFacade;
    3131using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
    32 using HeuristicLab.Tracing;
     32using HeuristicLab.Hive.Tracing;
    3333
    3434namespace HeuristicLab.Hive.Slave.Core {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLab.Hive.Slave.Core-3.3.csproj

    r4368 r4710  
    2020    <OldToolsVersion>3.5</OldToolsVersion>
    2121    <UpgradeBackupLocation />
     22    <TargetFrameworkProfile />
    2223  </PropertyGroup>
    2324  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    8687    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    8788      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Tracing-3.3">
    90       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9189    </Reference>
    9290    <Reference Include="System" />
     
    176174      <Name>HeuristicLab.Hive.Slave.ExecutionEngine-3.3</Name>
    177175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
     177      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
     178      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     179    </ProjectReference>
    178180  </ItemGroup>
    179181  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLabHiveSlaveCorePlugin.cs

    r4424 r4710  
    3333  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
    3434  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
    35   [PluginDependency("HeuristicLab.Tracing", "3.3")]
     35  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
    3636  public class HeuristicLabHiveSlaveCorePlugin: PluginBase {
    3737  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs

    r4424 r4710  
    2929using HeuristicLab.Hive.Slave.Communication;
    3030using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
    31 using HeuristicLab.Tracing;
     31using HeuristicLab.Hive.Tracing;
    3232
    3333namespace HeuristicLab.Hive.Slave.Core.JobStorage {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

    r4424 r4710  
    2929using HeuristicLab.PluginInfrastructure;
    3030using HeuristicLab.PluginInfrastructure.Manager;
    31 using HeuristicLab.Tracing;
     31using HeuristicLab.Hive.Tracing;
    3232
    3333namespace HeuristicLab.Hive.Slave.Core {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config

    r4337 r4710  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0"?>
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5       <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66    </sectionGroup>
    77  </configSections>
     
    99    <HeuristicLab.Hive.Slave.Core.Properties.Settings>
    1010      <setting name="ServerIP" serializeAs="String">
    11         <value />
     11        <value/>
    1212      </setting>
    1313      <setting name="Guid" serializeAs="String">
     
    2020      <serviceBehaviors>
    2121        <behavior name="SlaveConsoleServiceBehaviour">
    22           <serviceMetadata />
     22          <serviceMetadata/>
    2323        </behavior>
    2424      </serviceBehaviors>
     
    3434    </bindings>
    3535    <services>
    36       <service behaviorConfiguration="SlaveConsoleServiceBehaviour"
    37         name="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.SlaveConsoleCommunicator">
    38         <endpoint binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpBinding"
    39           name="SlaveConsoleTcpEndpoint" contract="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces.ISlaveConsoleCommunicator" />
    40         <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration=""
    41           name="SlaveConsoleTcpMexEndpoint" contract="IMetadataExchange" />
     36      <service behaviorConfiguration="SlaveConsoleServiceBehaviour" name="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.SlaveConsoleCommunicator">
     37        <endpoint binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpBinding" name="SlaveConsoleTcpEndpoint" contract="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces.ISlaveConsoleCommunicator"/>
     38        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="SlaveConsoleTcpMexEndpoint" contract="IMetadataExchange"/>
    4239        <host>
    4340          <baseAddresses>
    44             <add baseAddress="net.tcp://localhost:8000/SlaveConsoleService" />
     41            <add baseAddress="net.tcp://localhost:8000/SlaveConsoleService"/>
    4542          </baseAddresses>
    4643        </host>
     
    4845    </services>
    4946  </system.serviceModel>
    50 </configuration>
     47<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj

    r4368 r4710  
    1919    <OldToolsVersion>3.5</OldToolsVersion>
    2020    <UpgradeBackupLocation />
     21    <TargetFrameworkProfile />
    2122  </PropertyGroup>
    2223  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.Tracing-3.3.csproj

    r4368 r4710  
    9696    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    9797  </PropertyGroup>
     98  <PropertyGroup>
     99    <SignAssembly>true</SignAssembly>
     100  </PropertyGroup>
     101  <PropertyGroup>
     102    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     103  </PropertyGroup>
    98104  <ItemGroup>
    99105    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    100106      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    101107    </Reference>
    102     <Reference Include="HeuristicLab.Tracing-3.3">
    103       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    104     </Reference>
    105     <Reference Include="log4net">
    106       <HintPath>C:\Program Files\HeuristicLab 3.3\log4net.dll</HintPath>
    107     </Reference>
    108108    <Reference Include="System" />
    109109    <Reference Include="System.Core" />
     110    <Reference Include="System.ServiceModel" />
    110111    <Reference Include="System.Xml.Linq" />
    111112    <Reference Include="System.Data.DataSetExtensions" />
     
    115116  <ItemGroup>
    116117    <Compile Include="HeuristicLabHiveTracingPlugin.cs" />
    117     <Compile Include="MethodCallPatternConverter.cs" />
    118     <Compile Include="MethodCallPatternLayout.cs" />
     118    <Compile Include="Logger.cs" />
    119119    <Compile Include="Properties\AssemblyInfo.cs" />
    120120  </ItemGroup>
    121121  <ItemGroup>
    122     <Content Include="HeuristicLab.Hive.log4net.xml">
    123       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    124     </Content>
     122    <None Include="HeuristicLab.snk" />
     123    <None Include="Properties\AssemblyInfo.frame" />
    125124  </ItemGroup>
    126125  <ItemGroup>
    127     <None Include="app.config" />
    128     <None Include="Properties\AssemblyInfo.frame" />
     126    <WCFMetadata Include="Service References\" />
    129127  </ItemGroup>
    130128  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLabHiveTracingPlugin.cs

    r4424 r4710  
    2525  [Plugin("HeuristicLab.Hive.Tracing", "3.3")]
    2626  [PluginFile("HeuristicLab.Hive.Tracing-3.3.dll", PluginFileType.Assembly)]
    27   [PluginFile("HeuristicLab.Hive.log4net.xml", PluginFileType.Data)]
    28   [PluginDependency("HeuristicLab.Tracing", "3.3")]
    29   [PluginDependency("HeuristicLab.log4net", "1.2.10.0")]
    3027  public class HeuristicLabHiveTracingPlugin : PluginBase {
    3128  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

    r4425 r4710  
    2323HeuristicLab.Hive.Server.DataAccess\3.3:HeuristicLab.Hive.Server.DataAccess-3.3.dll
    2424HeuristicLab.Hive.Server.LINQDataAccess\3.3:HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll
    25 HeuristicLab.Hive.Server.Scheduler\3.3:HeuristicLab.Hive.Server.Scheduler-3.3.dll
    2625
    2726HeuristicLab.Hive.Tracing\3.3:HeuristicLab.Hive.Tracing-3.3.dll
    28 HeuristicLab.Hive.Tracing\3.3:HeuristicLab.Hive.log4net.xml
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

    r4320 r4710  
    88ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Communication\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    99ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Console\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    10 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Tracing\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    1110
    1211ConfigMerger "HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config"
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb

    • Property svn:ignore set to
      Bin
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs

    r4629 r4710  
    77using HeuristicLab.Tracing;
    88using System.IO;
     9using HeuristicLab.Hive.Contracts.Interfaces;
     10using HeuristicLab.PluginInfrastructure;
    911
    1012namespace HeuristicLab.Hive.Server.Core.IISModules {
    1113  public class HiveServerModule : IHttpModule {
    12     Thread t;
    13 
    14     #region IHttpModule Members
    15 
    16     public void Dispose() {
    17       if (t != null && t.ThreadState == ThreadState.Running) {
    18         t.Abort();
    19       }
    20       File.Create(@"C:\ch\stuff\Log\Dispose" + Thread.CurrentThread.ManagedThreadId).Dispose();
    21     }
    22 
     14    private static object locker = new object();
     15    private static ILifecycleManager lifecycleManager;
     16   
    2317    public void Init(HttpApplication context) {
    24 
    25       File.Create(@"C:\ch\stuff\Log\Init." + Thread.CurrentThread.ManagedThreadId).Dispose();
    26       t = new Thread(DoSomething);
    27       t.Start();
    28     }
    29 
    30     private void DoSomething() {
    31       int i = 0;
    32       while (true) {
    33         Thread.Sleep(1000);
    34         File.Create(@"C:\ch\stuff\Log\file" + Thread.CurrentThread.ManagedThreadId + "." + i).Dispose();
    35         i++;
     18      lock (locker) {
     19        lifecycleManager = ServiceLocator.GetLifecycleManager();
     20        lifecycleManager.Start();
    3621      }
    3722    }
    3823
    39     #endregion
     24    public void Dispose() {
     25      lock (locker) {
     26        lifecycleManager.Stop();
     27      }
     28    }
    4029  }
    4130}
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/Web.config

    r4629 r4710  
    1 <?xml version="1.0" encoding="UTF-8"?>
     1<?xml version="1.0"?>
    22<configuration>
    3 
    43  <configSections>
    5     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    6       <section name="HeuristicLab.Tracing.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Tracing.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    76    </sectionGroup>
    87  </configSections>
    9 
     8 
     9  <!--
     10  <system.diagnostics>
     11    <sources>
     12      <source name="System.ServiceModel.MessageLogging" switchValue="Warning, ActivityTracing">
     13        <listeners>
     14          <add type="System.Diagnostics.DefaultTraceListener" name="Default">
     15            <filter type="" />
     16          </add>
     17          <add name="ServiceModelMessageLoggingListener">
     18            <filter type="" />
     19          </add>
     20        </listeners>
     21      </source>
     22      <source name="System.ServiceModel" switchValue="Information,ActivityTracing">
     23        <listeners>
     24          <add type="System.Diagnostics.DefaultTraceListener" name="Default">
     25            <filter type="" />
     26          </add>
     27          <add name="ServiceModelTraceListener">
     28            <filter type="" />
     29          </add>
     30        </listeners>
     31      </source>
     32    </sources>
     33    <sharedListeners>
     34      <add initializeData="c:\ch\svn\branches\heuristiclab.hive\sources\heuristiclab.hive\hiveweb\web_messages.svclog"
     35        type="System.Diagnostics.XmlWriterTraceListener, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
     36        name="ServiceModelMessageLoggingListener" traceOutputOptions="DateTime, Timestamp">
     37        <filter type="" />
     38      </add>
     39      <add initializeData="c:\ch\svn\branches\heuristiclab.hive\sources\heuristiclab.hive\hiveweb\web_tracelog.svclog"
     40        type="System.Diagnostics.XmlWriterTraceListener, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
     41        name="ServiceModelTraceListener" traceOutputOptions="DateTime, Timestamp">
     42        <filter type="" />
     43      </add>
     44    </sharedListeners>
     45  </system.diagnostics>
     46  -->
     47 
    1048  <applicationSettings>
    1149    <HeuristicLab.Tracing.Properties.Settings>
    1250      <setting name="TracingLog4netConfigFile" serializeAs="String">
    13         <value />
     51        <value/>
    1452      </setting>
    1553    </HeuristicLab.Tracing.Properties.Settings>
     
    1755 
    1856  <connectionStrings>
    19     <add name="HeuristicLab.Authentication"
    20          connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
     57    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
    2158  </connectionStrings>
    22 
     59 
    2360  <system.web>
    24 
    25     <compilation debug="true" targetFramework="4.0" />
    26 
     61    <compilation debug="true" targetFramework="4.0">
     62    </compilation>
    2763    <membership>
    2864      <providers>
    2965        <clear/>
    30         <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
    31              enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
    32              maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
    33              applicationName="HeuristicLab.Authentication" />
     66        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
    3467      </providers>
    3568    </membership>
    36 
    3769    <roleManager enabled="true">
    3870      <providers>
    3971        <clear/>
    40         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
     72        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
    4173      </providers>
    4274    </roleManager>
     75    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
    4376  </system.web>
    44 
    45 
    46 
     77 
    4778  <system.serviceModel>
    4879    <diagnostics>
    49       <messageLogging logEntireMessage="true" logMalformedMessages="true"
    50         logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true"
    51         maxMessagesToLog="3000" />
     80      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
    5281    </diagnostics>
     82   
    5383    <bindings>
    5484      <netTcpBinding>
    55         <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed"
    56           maxBufferPoolSize="104857600" maxBufferSize="104857600"
    57           maxReceivedMessageSize="104857600" maxConnections="50">
    58           <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
     85        <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed" maxBufferPoolSize="104857600" maxBufferSize="104857600" maxReceivedMessageSize="104857600">
     86          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600"/>
    5987          <security mode="TransportWithMessageCredential">
    6088            <transport clientCredentialType="Certificate"/>
    61             <message clientCredentialType="UserName" />
     89            <message clientCredentialType="UserName"/>
    6290          </security>
    6391        </binding>
     
    6795          <security mode="Message">
    6896            <transport/>
    69             <message clientCredentialType="UserName" />
     97            <message clientCredentialType="UserName"/>
    7098          </security>
    7199        </binding>
    72100      </wsHttpBinding>
    73101    </bindings>
     102   
    74103    <behaviors>
    75104      <serviceBehaviors>
    76105        <behavior name="ServiceBehaviour">
    77           <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
    78           <serviceDebug includeExceptionDetailInFaults="true" />
    79           <serviceAuthorization principalPermissionMode="UseAspNetRoles"
    80             roleProviderName="AspNetSqlRoleProvider" />
     106          <serviceMetadata httpGetEnabled="false" httpsGetEnabled="false"/>
     107          <serviceDebug includeExceptionDetailInFaults="true"/>
     108          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
    81109          <serviceCredentials>
    82             <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
    83             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
    84               membershipProviderName="AspNetSqlMembershipProvider" />
     110            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName"/>
     111            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
    85112          </serviceCredentials>
    86           <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false"
    87             messageAuthenticationAuditLevel="SuccessOrFailure" />
     113          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure"/>
    88114          <serviceThrottling maxConcurrentCalls="100"/>
    89115        </behavior>
    90116      </serviceBehaviors>
    91117    </behaviors>
     118   
    92119    <services>
    93120      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.SlaveFacade">
    94         <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
    95         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange" />
    96         <!--<endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />-->
    97         <host>
    98           <baseAddresses>
    99             <add baseAddress="http://localhost:9000/SlaveService" />
    100             <!--<add baseAddress="net.tcp://localhost:9001/SlaveServiceStreamed" />-->
    101           </baseAddresses>
    102         </host>
     121        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade"/>
     122        <endpoint address="mex" binding="mexHttpBinding" name="SlaveMexEndpoint" contract="IMetadataExchange"/>
     123        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
     124        <endpoint address="mex" binding="mexTcpBinding" name="ClientNetTcpMexEndpoint" contract="IMetadataExchange"/>
    103125      </service>
    104126      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ServerConsoleFacade">
    105         <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
    106         <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange" />
    107         <host>
    108           <baseAddresses>
    109             <add baseAddress="http://localhost:9000/ServerConsoleService" />
    110           </baseAddresses>
    111         </host>
     127        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade"/>
     128        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange"/>
    112129      </service>
    113130      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ClientFacade">
    114         <!--<endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />-->
    115         <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
    116         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange" />
    117         <host>
    118           <baseAddresses>
    119             <!--<add baseAddress="net.tcp://localhost:9001/ClientServiceStreamed" />-->
    120             <add baseAddress="http://localhost:9000/ClientService" />
    121           </baseAddresses>
    122         </host>
     131        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"/>
     132        <endpoint address="mex" binding="mexHttpBinding" name="ClientHttpMexEndpoint" contract="IMetadataExchange"/>
     133        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
     134        <endpoint address="mex" binding="mexTcpBinding" name="ClientNetTcpMexEndpoint" contract="IMetadataExchange"/>
    123135      </service>
    124136    </services>
     137   
    125138  </system.serviceModel>
    126 
    127 
     139 
    128140  <system.webServer>
    129141    <modules runAllManagedModulesForAllRequests="true">
    130       <add name="HiveServerModule" type="HeuristicLab.Hive.Server.Core.IISModules.HiveServerModule" />
     142      <add name="HiveServerModule" type="HeuristicLab.Hive.Server.Core.IISModules.HiveServerModule"/>
    131143    </modules>
    132     <directoryBrowse enabled="true" />
     144    <directoryBrowse enabled="true"/>
    133145  </system.webServer>
    134 
     146 
    135147</configuration>
Note: See TracChangeset for help on using the changeset viewer.