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

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DatasetRefactor/sources

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.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.Hive.Web/Hive-3.3/Web.config

    r9665 r12031  
    33  <configSections>
    44    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    5       <section name="HeuristicLab.Services.Hive.DataAccess.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     5      <section name="HeuristicLab.Services.Hive.DataAccess.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
    66    </sectionGroup>
    77  </configSections>
    8    
    98  <appSettings>
    10     <add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
     9    <add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;"/>
    1110  </appSettings>
    1211  <applicationSettings>
    13      <HeuristicLab.Services.Hive.DataAccess.Settings>
     12    <HeuristicLab.Services.Hive.DataAccess.Settings>
    1413      <setting name="LongRunningDatabaseCommandTimeout" serializeAs="String">
    1514        <value>00:05:00</value>
    … …  
    2221  <connectionStrings>
    2322    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
    24    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString"
    25       connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;"
    26       providerName="System.Data.SqlClient" />
     23    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/>
    2724  </connectionStrings>
     25  <!--
     26    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
     27
     28    The following attributes can be set on the <httpRuntime> tag.
     29      <system.Web>
     30        <httpRuntime targetFramework="4.5" />
     31      </system.Web>
     32  -->
    2833  <system.web>
    29     <authentication mode="Forms" />
    30     <compilation debug="true" targetFramework="4.0">
     34    <authentication mode="Forms"/>
     35    <compilation debug="true" targetFramework="4.5">
    3136      <assemblies>
    3237        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
    … …  
    4752    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
    4853      <controls>
    49         <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting"
    50          assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     54        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
    5155      </controls>
    5256    </pages>
    … …  
    6064      <wsHttpBinding>
    6165        <binding name="WSHttpBinding_IHiveService" messageEncoding="Text" receiveTimeout="00:35:00" sendTimeout="00:35:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    62           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
     66          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
    6367          <security mode="Message">
    6468            <transport clientCredentialType="Certificate"/>
    … …  
    6973      <netTcpBinding>
    7074        <binding name="NetTcpBinding_IHiveService" portSharingEnabled="true" receiveTimeout="00:35:00" sendTimeout="00:35:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    71           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
     75          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
    7276          <security mode="TransportWithMessageCredential">
    7377            <transport clientCredentialType="Certificate"/>
    … …  
    100104        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="MexTcpEndpoint" contract="IMetadataExchange"/>
    101105        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
    102         <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding"  bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
     106        <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
    103107      </service>
    104108    </services>
    … …  
    106110  </system.serviceModel>
    107111  <system.webServer>
    108     <directoryBrowse enabled="true" />
     112    <directoryBrowse enabled="true"/>
    109113    <handlers>
    110       <remove name="ChartImageHandler" />
    111       <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST"
    112        path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     114      <remove name="ChartImageHandler"/>
     115      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
    113116    </handlers>
    114   </system.webServer> 
     117  </system.webServer>
    115118</configuration>
Note: See TracChangeset for help on using the changeset viewer.