- Timestamp:
- 09/14/18 11:47:37 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
HeuristicLab.Services.Hive.Web (modified) (1 prop)
-
HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config (modified) (3 diffs)
-
HeuristicLab.Services.Hive.Web/web_services.config (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Hive.Web
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.Web merged eligible /stable/HeuristicLab.Services.Hive.Web merged eligible /trunk/HeuristicLab.Services.Hive.Web merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Services.Hive.Web 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Services.Hive.Web 5516-5520 /branches/Async/HeuristicLab.Services.Hive.Web 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Services.Hive.Web 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Hive.Web 4656-4721 /branches/CodeEditor/HeuristicLab.Services.Hive.Web 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Hive.Web 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Hive.Web 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Hive.Web 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Services.Hive.Web 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Services.Hive.Web 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Hive.Web 5060 /branches/HLScript/HeuristicLab.Services.Hive.Web 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive.Web 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.Hive.Web 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Hive.Web 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Web 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Services.Hive.Web 10202-10483 /branches/NET40/sources/HeuristicLab.Services.Hive.Web 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Services.Hive.Web 12033-12122 /branches/ParallelEngine/HeuristicLab.Services.Hive.Web 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Hive.Web 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Hive.Web 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Hive.Web 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Hive.Web 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive.Web 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Hive.Web 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.Hive.Web 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Hive.Web 5370-5682 /branches/Trunk/HeuristicLab.Services.Hive.Web 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Hive.Web 9168-9215 /branches/VNS/HeuristicLab.Services.Hive.Web 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Services.Hive.Web 12948-12950 /branches/histogram/HeuristicLab.Services.Hive.Web 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Services.Hive.Web 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config
r14749 r16141 23 23 24 24 <connectionStrings> 25 <add name="HeuristicLab.Authentication" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />26 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />25 <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 26 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4" /> 27 27 </connectionStrings> 28 28 … … 62 62 <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" 63 63 name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" /> 64 <endpoint address="net.tcp:// localhost:8001/Hive-3.3/HiveService.svc"64 <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc" 65 65 binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService" 66 66 name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService" /> 67 67 <host> 68 68 <baseAddresses> 69 <add baseAddress="http:// localhost:8000/Hive-3.3/HiveService.svc" />69 <add baseAddress="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" /> 70 70 </baseAddresses> 71 71 </host> … … 101 101 <serviceDebug includeExceptionDetailInFaults="true" /> 102 102 <serviceCredentials> 103 <serviceCertificate findValue=" localhost" x509FindType="FindBySubjectName" />103 <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" /> 104 104 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" 105 105 membershipProviderName="AspNetSqlMembershipProvider" /> -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Hive.Web/web_services.config
r9665 r16141 25 25 <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/> 26 26 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" 27 connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3. 3;Integrated Security=True;"27 connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;" 28 28 providerName="System.Data.SqlClient" /> 29 29 </connectionStrings> … … 118 118 <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="MexTcpEndpoint" contract="IMetadataExchange"/> 119 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"/>120 <endpoint address="net.tcp://10.20.71.54/Hive-3.4/HiveService.svc" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/> 121 121 </service> 122 122 </services>
Note: See TracChangeset
for help on using the changeset viewer.
