Ignore:
Timestamp:
07/06/13 11:38:38 (9 years ago)
Author:
ascheibe
Message:

#2030 merged r9665,r9666,r9675 into the stable branch

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config

    r9251 r9700  
    5454  </system.web>
    5555  <system.serviceModel>
    56     <diagnostics>
     56    <diagnostics performanceCounters="All">
    5757      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
    5858    </diagnostics>
    5959    <bindings>
    6060      <wsHttpBinding>
    61         <binding name="WSHttpBinding_IHiveService" receiveTimeout="00:15:00" sendTimeout="00:10:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
     61        <binding name="WSHttpBinding_IHiveService" messageEncoding="Text" receiveTimeout="00:35:00" sendTimeout="00:35:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    6262          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    6363          <security mode="Message">
     
    6767        </binding>
    6868      </wsHttpBinding>
     69      <netTcpBinding>
     70        <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" />
     72          <security mode="TransportWithMessageCredential">
     73            <transport clientCredentialType="Certificate"/>
     74            <message clientCredentialType="UserName"/>
     75          </security>
     76        </binding>
     77      </netTcpBinding>
    6978    </bindings>
    7079    <behaviors>
     
    8897    <services>
    8998      <service behaviorConfiguration="ServiceBehaviour_IHiveService" name="HeuristicLab.Services.Hive.HiveService">
    90         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange"/>
    91         <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>
     99        <endpoint address="mexhttp" binding="mexHttpBinding" bindingConfiguration="" name="MexHttpEndpoint" contract="IMetadataExchange"/>
     100        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="MexTcpEndpoint" contract="IMetadataExchange"/>
     101        <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"/>
    92103      </service>
    93104    </services>
  • stable/HeuristicLab.Services.Hive.Web/web_services.config

    r9251 r9700  
    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.