Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 13:34:37 (10 years ago)
Author:
ascheibe
Message:

merged only Hive changes from trunk into branch

Location:
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Web
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Web

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Services.Hive.Webmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Services.Hive.Web5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Services.Hive.Web6917-7005
      /branches/CloningRefactoring/HeuristicLab.Services.Hive.Web4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Services.Hive.Web5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Hive.Web5815-6180
      /branches/DataAnalysis/HeuristicLab.Services.Hive.Web4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Services.Hive.Web6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Hive.Web5060
      /branches/NET40/sources/HeuristicLab.Services.Hive.Web5138-5162
      /branches/ParallelEngine/HeuristicLab.Services.Hive.Web5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Hive.Web7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Services.Hive.Web6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Services.Hive.Web6828
      /branches/RuntimeOptimizer/HeuristicLab.Services.Hive.Web8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive.Web7787-8333
      /branches/SlaveShutdown/HeuristicLab.Services.Hive.Web8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Services.Hive.Web5370-5682
      /branches/Trunk/HeuristicLab.Services.Hive.Web6829-6865
      /branches/UnloadJobs/HeuristicLab.Services.Hive.Web9168-9215
      /branches/VNS/HeuristicLab.Services.Hive.Web5594-5752
      /branches/histogram/HeuristicLab.Services.Hive.Web5959-6341

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Web/web_services.config

    r11203 r11204  
    2929  </connectionStrings>
    3030 
    31   <system.web>
     31  <system.web>     
    3232  <customErrors mode="Off"/>
    3333    <authentication mode="Forms" />
    34     <compilation debug="true" targetFramework="4.0">
     34    <compilation debug="true" targetFramework="4.0" batch="false">
    3535      <assemblies>
    3636        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
    … …  
    5555      </controls>
    5656    </pages>
    57     <httpRuntime maxRequestLength="2147483647"/>
    58  
     57    <httpRuntime maxRequestLength="2147483647"/>   
    5958  </system.web>
    6059 
    … …  
    6766      <wsHttpBinding>
    6867        <binding name="WSHttpBinding_IHiveService"
    69       receiveTimeout="00:15:00"
    70           sendTimeout="00:10:00"
     68      receiveTimeout="00:35:00"
     69          sendTimeout="00:35:00"
    7170      maxBufferPoolSize="2147483647"
    7271      maxReceivedMessageSize="2147483647">
    … …  
    7877        </binding>
    7978      </wsHttpBinding>
     79    <netTcpBinding>
     80        <binding name="NetTcpBinding_IHiveService" portSharingEnabled="true" receiveTimeout="00:35:00" sendTimeout="00:35:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
     81          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
     82          <security mode="TransportWithMessageCredential">
     83            <transport clientCredentialType="Certificate"/>
     84            <message clientCredentialType="UserName"/>
     85          </security>
     86        </binding>
     87      </netTcpBinding>
    8088    </bindings>
    8189   
    … …  
    105113    </behaviors>
    106114
    107     <services>
     115     <services>
    108116      <service behaviorConfiguration="ServiceBehaviour_IHiveService" name="HeuristicLab.Services.Hive.HiveService">
    109         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange" />
    110         <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" />
     117        <endpoint address="mexhttp" binding="mexHttpBinding" bindingConfiguration="" name="MexHttpEndpoint" contract="IMetadataExchange"/>
     118        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="MexTcpEndpoint" contract="IMetadataExchange"/>
     119        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
     120        <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"/>
    111121      </service>
    112122    </services>
Note: See TracChangeset for help on using the changeset viewer.