Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Services.OKB/3.3/Web.config

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.OKB (modified) (1 prop)
• HeuristicLab.Services.OKB/3.3/Web.config (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Services.OKB/3.3/Web.config

@@ -2 +2 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
-    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"/>
   </connectionStrings>
 
@@ -34 +34 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/AdministrationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/AdministrationService.svc" />
           </baseAddresses>
         </host>
@@ -41 +41 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
           name="WSHttpBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
-        <endpoint address="net.tcp://localhost:8001/OKB-3.3/QueryService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/OKB-3.3/QueryService.svc"
           binding="netTcpBinding" bindingConfiguration="DefaultNetBinding"
           name="NetBinding_IQueryService" contract="HeuristicLab.Services.OKB.Query.IQueryService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/QueryService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/QueryService.svc" />
           </baseAddresses>
         </host>
@@ -55 +55 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/OKB-3.3/RunCreationService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/OKB-3.3/RunCreationService.svc" />
           </baseAddresses>
         </host>
@@ -91 +91 @@
             roleProviderName="AspNetSqlRoleProvider" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />