Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/18/15 10:54:32 (10 years ago)
Author:
bburlacu
Message:

#2276: Merged trunk changes.

Location:
branches/HeuristicLab.DatasetRefactor/sources
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DatasetRefactor/sources

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/AdminService.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/App.config

    r7283 r12031  
    4141
    4242  <connectionStrings>
    43     <add name="HeuristicLab.Authentication"
    44          connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
    45     <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString"
    46          connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment" />
     43    <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
     44    <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>
    4745  </connectionStrings>
    4846
    … …  
    5654
    5755  <system.web>
    58     <compilation debug="true" />
    59     <httpRuntime maxRequestLength="2097151" />
     56    <compilation debug="true"/>
     57    <httpRuntime maxRequestLength="2097151"/>
    6058    <membership defaultProvider="AspNetSqlMembershipProvider">
    6159      <providers>
    62         <clear />
    63         <add name="AspNetSqlMemberShipProvider" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
    64              connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" enablePasswordReset="false"
    65              enablePasswordRetrieval="false" passwordFormat="Hashed" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
    66              minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="8" />
     60        <clear/>
     61        <add name="AspNetSqlMemberShipProvider" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" enablePasswordReset="false" enablePasswordRetrieval="false" passwordFormat="Hashed" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="8"/>
    6762      </providers>
    6863    </membership>
    69     <authentication mode="Windows" />
     64    <authentication mode="Windows"/>
    7065    <roleManager enabled="true" defaultProvider="AspNetSqlRoleProvider">
    7166      <providers>
    72         <clear />
    73         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
    74              connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
     67        <clear/>
     68        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
    7569      </providers>
    7670    </roleManager>
    … …  
    8377      <wsHttpBinding>
    8478        <binding name="DefaultWsHttpBinding" maxBufferPoolSize="10000000" maxReceivedMessageSize="200000000">
    85           <readerQuotas maxDepth="1000" maxStringContentLength="200000000" maxArrayLength="200000000" maxBytesPerRead="200000000" maxNameTableCharCount="16000" />
     79          <readerQuotas maxDepth="1000" maxStringContentLength="200000000" maxArrayLength="200000000" maxBytesPerRead="200000000" maxNameTableCharCount="16000"/>
    8680          <security mode="Message">
    87             <message clientCredentialType="UserName" />
     81            <message clientCredentialType="UserName"/>
    8882          </security>
    8983        </binding>
    9084      </wsHttpBinding>
    9185      <mexHttpBinding>
    92         <binding name="DefaultMexHttpBinding" />
     86        <binding name="DefaultMexHttpBinding"/>
    9387      </mexHttpBinding>
    9488    </bindings>
    … …  
    10195      <endpointBehaviors>
    10296        <behavior name="DefaultEndpointBehavior">
    103           <dataContractSerializer maxItemsInObjectGraph="1000000" />
     97          <dataContractSerializer maxItemsInObjectGraph="1000000"/>
    10498        </behavior>
    10599      </endpointBehaviors>
    … …  
    107101      <serviceBehaviors>
    108102        <behavior name="DefaultServiceBehavior">
    109           <serviceMetadata httpGetEnabled="true" />
    110           <serviceDebug includeExceptionDetailInFaults="true" />
     103          <serviceMetadata httpGetEnabled="true"/>
     104          <serviceDebug includeExceptionDetailInFaults="true"/>
    111105          <serviceCredentials>
    112             <serviceCertificate findValue="localhost" storeLocation="LocalMachine"
    113                                 storeName="My" x509FindType="FindBySubjectName" />
    114             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
    115                                     membershipProviderName="AspNetSqlMembershipProvider" />
     106            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
     107            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
    116108          </serviceCredentials>
    117           <serviceAuthorization principalPermissionMode="UseAspNetRoles"
    118                                 roleProviderName="AspNetSqlRoleProvider" />
     109          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
    119110        </behavior>
    120111      </serviceBehaviors>
    … …  
    123114    <services>
    124115      <service name="HeuristicLab.Services.Deployment.UpdateService" behaviorConfiguration="DefaultServiceBehavior">
    125         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" />
    126         <endpoint behaviorConfiguration="DefaultEndpointBehavior" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    127                   contract="HeuristicLab.Services.Deployment.IUpdateService" />
     116        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
     117        <endpoint behaviorConfiguration="DefaultEndpointBehavior" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.Deployment.IUpdateService"/>
    128118        <host>
    129119          <baseAddresses>
    130             <add baseAddress="http://localhost:8732/Design_Time_Addresses/Deployment-3.3/UpdateService" />
     120            <add baseAddress="http://localhost:8732/Design_Time_Addresses/Deployment-3.3/UpdateService"/>
    131121          </baseAddresses>
    132122        </host>
    … …  
    134124
    135125      <service name="HeuristicLab.Services.Deployment.AdminService" behaviorConfiguration="DefaultServiceBehavior">
    136         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" />
    137         <endpoint behaviorConfiguration="DefaultEndpointBehavior" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    138                   contract="HeuristicLab.Services.Deployment.IAdminService" />
     126        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
     127        <endpoint behaviorConfiguration="DefaultEndpointBehavior" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.Deployment.IAdminService"/>
    139128        <host>
    140129          <baseAddresses>
    141             <add baseAddress="http://localhost:8732/Design_Time_Addresses/Deployment-3.3/AdminService" />
     130            <add baseAddress="http://localhost:8732/Design_Time_Addresses/Deployment-3.3/AdminService"/>
    142131          </baseAddresses>
    143132        </host>
    … …  
    145134    </services>
    146135  </system.serviceModel>
    147 </configuration>
     136<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/HeuristicLab.Services.Deployment-3.3.csproj

    r8600 r12031  
    1313    <ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    1414    <StartArguments>/client:"WcfTestClient.exe"</StartArguments>
    15     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     15    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1616    <TargetFrameworkProfile>
    1717    </TargetFrameworkProfile>
    … …  
    3232    <WarningLevel>4</WarningLevel>
    3333    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     34    <Prefer32Bit>false</Prefer32Bit>
    3435  </PropertyGroup>
    3536  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    4142    <WarningLevel>4</WarningLevel>
    4243    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     44    <Prefer32Bit>false</Prefer32Bit>
    4345  </PropertyGroup>
    4446  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    5052    <ErrorReport>prompt</ErrorReport>
    5153    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     54    <Prefer32Bit>false</Prefer32Bit>
    5255  </PropertyGroup>
    5356  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    5962    <ErrorReport>prompt</ErrorReport>
    6063    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     64    <Prefer32Bit>false</Prefer32Bit>
    6165  </PropertyGroup>
    6266  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    6872    <ErrorReport>prompt</ErrorReport>
    6973    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     74    <Prefer32Bit>false</Prefer32Bit>
    7075  </PropertyGroup>
    7176  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    7782    <ErrorReport>prompt</ErrorReport>
    7883    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     84    <Prefer32Bit>false</Prefer32Bit>
    7985  </PropertyGroup>
    8086  <ItemGroup>
    … …  
    156162  </ProjectExtensions>
    157163  <PropertyGroup>
    158    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     164    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    159165set ProjectDir=$(ProjectDir)
    160166set SolutionDir=$(SolutionDir)
    … …  
    162168
    163169call PreBuildEvent.cmd</PreBuildEvent>
    164 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     170    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    165171export ProjectDir=$(ProjectDir)
    166172export SolutionDir=$(SolutionDir)

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/IAdminService.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/IUpdateService.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/PluginDescription.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/PluginStore.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/ProductDescription.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/Properties/AssemblyInfo.cs.frame

    r11174 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/Properties/Settings.Designer.cs

    r4065 r12031  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.1
     4//     Runtime Version:4.0.30319.34014
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/Tests/HeuristicLab.Services.Deployment-3.3.Tests.csproj

    r7155 r12031  
    1111    <RootNamespace>HeuristicLab.Services.Deployment_3._3.Tests</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Services.Deployment_3._3.Tests</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    … …  
    3333    <UseApplicationTrust>false</UseApplicationTrust>
    3434    <BootstrapperEnabled>true</BootstrapperEnabled>
     35    <TargetFrameworkProfile />
    3536  </PropertyGroup>
    3637  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    4344    <WarningLevel>4</WarningLevel>
    4445    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     46    <Prefer32Bit>false</Prefer32Bit>
    4547  </PropertyGroup>
    4648  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    5254    <WarningLevel>4</WarningLevel>
    5355    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     56    <Prefer32Bit>false</Prefer32Bit>
    5457  </PropertyGroup>
    5558  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    6164    <ErrorReport>prompt</ErrorReport>
    6265    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     66    <Prefer32Bit>false</Prefer32Bit>
    6367  </PropertyGroup>
    6468  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    7074    <ErrorReport>prompt</ErrorReport>
    7175    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     76    <Prefer32Bit>false</Prefer32Bit>
    7277  </PropertyGroup>
    7378  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    7984    <ErrorReport>prompt</ErrorReport>
    8085    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     86    <Prefer32Bit>false</Prefer32Bit>
    8187  </PropertyGroup>
    8288  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    8894    <ErrorReport>prompt</ErrorReport>
    8995    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     96    <Prefer32Bit>false</Prefer32Bit>
    9097  </PropertyGroup>
    9198  <ItemGroup>

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/Tests/PluginStoreTest.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/Tests/Properties/AssemblyInfo.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment/3.3/UpdateService.cs

    r11171 r12031  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.