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

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DatasetRefactor/sources

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

    r8040 r12031  
    22<configuration>
    33  <connectionStrings>
    4     <add name="HeuristicLab.Authentication"
    5          connectionString="Data Source=.;Initial Catalog=HeuristicLab.Authentication;Integrated Security=True"
    6          providerName="System.Data.SqlClient"/>
     4    <add name="HeuristicLab.Authentication" connectionString="Data Source=.;Initial Catalog=HeuristicLab.Authentication;Integrated Security=True" providerName="System.Data.SqlClient"/>
    75  </connectionStrings>
    86  <system.web>
    97    <membership defaultProvider="AspNetSqlMembershipProvider" userIsOnlineTimeWindow="20">
    108      <providers>
    11         <clear />
    12         <add name="AspNetSqlMemberShipProvider"
    13               type="System.Web.Security.SqlMembershipProvider"
    14               connectionStringName="HeuristicLab.Authentication"
    15               enablePasswordRetrieval="false"
    16               enablePasswordReset="true"
    17               requiresQuestionAndAnswer="false"
    18               passwordFormat="Hashed"
    19               applicationName="HeuristicLab.Authentication"
    20               requiresUniqueEmail="false"
    21               minRequiredPasswordLength="1"
    22               minRequiredNonalphanumericCharacters="0"
    23               maxInvalidPasswordAttempts="50" />
     9        <clear/>
     10        <add name="AspNetSqlMemberShipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" passwordFormat="Hashed" applicationName="HeuristicLab.Authentication" requiresUniqueEmail="false" minRequiredPasswordLength="1" minRequiredNonalphanumericCharacters="0" maxInvalidPasswordAttempts="50"/>
    2411      </providers>
    2512    </membership>
    26     <authentication mode="Windows" />
     13    <authentication mode="Windows"/>
    2714    <roleManager enabled="true" defaultProvider="AspNetSqlRoleProvider">
    2815      <providers>
    29         <clear />
    30         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
    31              connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
     16        <clear/>
     17        <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"/>
    3218      </providers>
    3319    </roleManager>
    … …  
    4026      <wsHttpBinding>
    4127        <binding name="DefaultWsHttpBinding" maxBufferPoolSize="10000000" maxReceivedMessageSize="200000000">
    42           <readerQuotas maxDepth="1000" maxStringContentLength="16000" maxArrayLength="200000000" maxBytesPerRead="200000000" maxNameTableCharCount="16000" />
     28          <readerQuotas maxDepth="1000" maxStringContentLength="16000" maxArrayLength="200000000" maxBytesPerRead="200000000" maxNameTableCharCount="16000"/>
    4329          <security mode="Message">
    44             <message clientCredentialType="UserName" />
     30            <message clientCredentialType="UserName"/>
    4531          </security>
    4632        </binding>
    4733      </wsHttpBinding>
    4834      <mexHttpBinding>
    49         <binding name="DefaultMexHttpBinding" />
     35        <binding name="DefaultMexHttpBinding"/>
    5036      </mexHttpBinding>
    5137    </bindings>
    … …  
    5844      <endpointBehaviors>
    5945        <behavior name="DefaultEndpointBehavior">
    60           <dataContractSerializer maxItemsInObjectGraph="1000000" />
     46          <dataContractSerializer maxItemsInObjectGraph="1000000"/>
    6147        </behavior>
    6248      </endpointBehaviors>
    … …  
    6450      <serviceBehaviors>
    6551        <behavior name="DefaultServiceBehavior">
    66           <serviceMetadata httpGetEnabled="true" />
    67           <serviceDebug includeExceptionDetailInFaults="true" />
     52          <serviceMetadata httpGetEnabled="true"/>
     53          <serviceDebug includeExceptionDetailInFaults="true"/>
    6854          <serviceCredentials>
    69             <serviceCertificate findValue="localhost" storeLocation="LocalMachine"
    70                                 storeName="My" x509FindType="FindBySubjectName" />
    71             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
    72                                     membershipProviderName="AspNetSqlMembershipProvider" />
     55            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
     56            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
    7357          </serviceCredentials>
    74           <serviceAuthorization principalPermissionMode="UseAspNetRoles"
    75                                 roleProviderName="AspNetSqlRoleProvider" />
     58          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
    7659        </behavior>
    7760      </serviceBehaviors>
    … …  
    8063    <services>
    8164      <service name="HeuristicLab.Services.Access.AccessService" behaviorConfiguration="DefaultServiceBehavior">
    82         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" />
    83         <endpoint behaviorConfiguration="DefaultEndpointBehavior" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    84                   contract="HeuristicLab.Services.Access.IAccessService" />
     65        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange"/>
     66        <endpoint behaviorConfiguration="DefaultEndpointBehavior" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.Access.IAccessService"/>
    8567        <host>
    8668          <baseAddresses>
    87             <add baseAddress="http://localhost:81/AccessService" />
     69            <add baseAddress="http://localhost:81/AccessService"/>
    8870          </baseAddresses>
    8971        </host>
    … …  
    9173    </services>
    9274  </system.serviceModel>
    93 </configuration>
     75<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.