Ignore:
Timestamp:
07/16/17 13:03:37 (3 years ago)
Author:
jkarder
Message:

#2743: merged r14722, r14726, r14732, r14738, r14748:14749, r14820, r14828, r15005 and r15075 into stable

Location:
stable
Files:
1 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

    r15082 r15261  
    309309    <None Include="HeuristicLab.snk" />
    310310    <None Include="Properties\AssemblyInfo.cs.frame" />
    311     <None Include="web.config" />
     311    <None Include="Web.config" />
    312312  </ItemGroup>
    313313  <ItemGroup>
  • stable/HeuristicLab.Services.OKB/3.3/app.config

    r11920 r15261  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    33  <connectionStrings>
    4     <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
     4    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
    55    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
    66  </connectionStrings>
    77
    88  <system.web>
    9     <compilation debug="true"/>
    10     <membership>
     9    <authentication mode="Forms" />
     10    <compilation debug="true" targetFramework="4.5" />
     11    <customErrors mode="Off" />
     12    <membership defaultProvider="AspNetSqlMembershipProvider">
    1113      <providers>
    12         <clear/>
    13         <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"/>
     14        <clear />
     15        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
     16             requiresQuestionAndAnswer="false" requiresUniqueEmail="false" applicationName="HeuristicLab.Authentication" minRequiredPasswordLength="8"
     17             minRequiredNonalphanumericCharacters="0" maxInvalidPasswordAttempts="5" />
    1418      </providers>
    1519    </membership>
    16     <roleManager enabled="true">
     20    <roleManager enabled="true" defaultProvider="AspNetSqlRoleProvider">
    1721      <providers>
    18         <clear/>
    19         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
     22        <clear />
     23        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
    2024      </providers>
    2125    </roleManager>
     
    2327
    2428  <system.serviceModel>
     29    <serviceHostingEnvironment multipleSiteBindingsEnabled="true"/>
     30    <services>
     31      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.Administration.AdministrationService">
     32        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
     33          contract="HeuristicLab.Services.OKB.Administration.IAdministrationService" />
     34        <host>
     35          <baseAddresses>
     36            <add baseAddress="http://localhost:8000/OKB-3.3/AdministrationService.svc" />
     37          </baseAddresses>
     38        </host>
     39      </service>
     40      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.Query.QueryService">
     41        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
     42          name="WSHttpBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
     43        <endpoint address="net.tcp://localhost:8001/OKB-3.3/QueryService.svc"
     44          binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IQueryService"
     45          name="NetBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
     46        <host>
     47          <baseAddresses>
     48            <add baseAddress="http://localhost:8000/OKB-3.3/QueryService.svc" />
     49          </baseAddresses>
     50        </host>
     51      </service>
     52      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.RunCreation.RunCreationService">
     53        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
     54          contract="HeuristicLab.Services.OKB.RunCreation.IRunCreationService" />
     55        <host>
     56          <baseAddresses>
     57            <add baseAddress="http://localhost:8000/OKB-3.3/RunCreationService.svc" />
     58          </baseAddresses>
     59        </host>
     60      </service>
     61    </services>
    2562    <bindings>
    26       <mexHttpBinding>
    27         <binding name="DefaultMexHttpBinding"/>
    28       </mexHttpBinding>
     63      <netTcpBinding>
     64        <binding name="NetTcpBinding_IQueryService" receiveTimeout="00:20:00"
     65          sendTimeout="00:20:00" maxBufferPoolSize="2147483647" maxBufferSize="2147483647"
     66          maxReceivedMessageSize="2147483647" portSharingEnabled="true">
     67          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
     68            maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
     69          <security mode="TransportWithMessageCredential">
     70            <message clientCredentialType="UserName" />
     71          </security>
     72        </binding>
     73      </netTcpBinding>
    2974      <wsHttpBinding>
    30         <binding name="DefaultWsHttpBinding" maxReceivedMessageSize="200000000">
    31           <readerQuotas maxArrayLength="200000000" maxBytesPerRead="200000000"/>
    32           <security mode="Message">
    33             <message clientCredentialType="UserName"/>
     75        <binding name="DefaultWsHttpBinding" maxBufferPoolSize="2147483647"
     76          maxReceivedMessageSize="2147483647">
     77          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
     78            maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
     79          <security>
     80            <message clientCredentialType="UserName" />
    3481          </security>
    3582        </binding>
    3683      </wsHttpBinding>
    3784    </bindings>
    38 
    3985    <behaviors>
    4086      <serviceBehaviors>
    4187        <behavior name="DefaultServiceBehavior">
    42           <serviceMetadata httpGetEnabled="true"/>
    43           <serviceDebug includeExceptionDetailInFaults="true"/>
    44           <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
     88          <serviceMetadata httpGetEnabled="true" />
     89          <serviceDebug includeExceptionDetailInFaults="true" />
     90          <serviceAuthorization principalPermissionMode="UseAspNetRoles"
     91            roleProviderName="AspNetSqlRoleProvider" />
    4592          <serviceCredentials>
    46             <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName"/>
    47             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
     93            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
     94            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
     95              membershipProviderName="AspNetSqlMembershipProvider" />
    4896          </serviceCredentials>
    49           <dataContractSerializer maxItemsInObjectGraph="6553600"/>
    5097        </behavior>
    5198      </serviceBehaviors>
    5299    </behaviors>
    53 
    54     <services>     
    55       <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.Administration.AdministrationService">
    56         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
    57         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.Administration.IAdministrationService"/>
    58         <host>
    59           <baseAddresses>
    60             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdministrationService"/>
    61           </baseAddresses>
    62         </host>
    63       </service>
    64       <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.RunCreation.RunCreationService">
    65         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
    66         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.RunCreation.IRunCreationService"/>
    67         <host>
    68           <baseAddresses>
    69             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/RunCreationService"/>
    70           </baseAddresses>
    71         </host>
    72       </service>
    73       <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.OKB.Query.QueryService">
    74         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
    75         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.Query.IQueryService"/>
    76         <host>
    77           <baseAddresses>
    78             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/QueryService"/>
    79           </baseAddresses>
    80         </host>
    81       </service>
    82     </services>
    83100  </system.serviceModel>
     101 
    84102  <startup>
    85103    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
Note: See TracChangeset for help on using the changeset viewer.