Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Services.Hive.Web/Hive-3.3

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.Hive.Web (modified) (1 prop)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config

@@ -23 +23 @@
   
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
+    <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4" />
   </connectionStrings>
 
@@ -62 +62 @@
         <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
           name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" />
-        <endpoint address="net.tcp://localhost:8001/Hive-3.3/HiveService.svc"
+        <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc"
           binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
           name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/Hive-3.3/HiveService.svc" />
+            <add baseAddress="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" />
           </baseAddresses>
         </host>
@@ -101 +101 @@
           <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
+            <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" />
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
               membershipProviderName="AspNetSqlMembershipProvider" />