- Timestamp:
- 11/20/18 15:26:57 (6 years ago)
- Location:
- branches/2845_EnhancedProgress
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2845_EnhancedProgress
- Property svn:mergeinfo changed
-
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Services.Deployment merged eligible /stable/HeuristicLab.Services.Deployment merged eligible /trunk/HeuristicLab.Services.Deployment merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Services.Deployment 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Services.Deployment 5516-5520 /branches/Async/HeuristicLab.Services.Deployment 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Services.Deployment 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Deployment 4656-4721 /branches/CodeEditor/HeuristicLab.Services.Deployment 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Deployment 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Deployment 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Deployment 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Services.Deployment 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Services.Deployment 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Deployment 5060 /branches/HLScript/HeuristicLab.Services.Deployment 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Deployment 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.Deployment 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Deployment 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Services.Deployment 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Services.Deployment 10202-10483 /branches/NET40/sources/HeuristicLab.Services.Deployment 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Services.Deployment 12033-12122 /branches/ParallelEngine/HeuristicLab.Services.Deployment 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Deployment 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Deployment 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Deployment 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Deployment 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Deployment 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Deployment 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.Deployment 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Deployment 5370-5682 /branches/Trunk/HeuristicLab.Services.Deployment 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Deployment 9168-9215 /branches/VNS/HeuristicLab.Services.Deployment 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Services.Deployment 12948-12950 /branches/histogram/HeuristicLab.Services.Deployment 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Services.Deployment 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/AdminService.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/IAdminService.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/IUpdateService.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/PluginDescription.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/PluginStore.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/ProductDescription.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/Properties/AssemblyInfo.cs.frame
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 6HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3.1 4.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")] -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/Tests/PluginStoreTest.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/Tests/Properties/AssemblyInfo.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 [assembly: AssemblyCompany("")] 32 32 [assembly: AssemblyProduct("HeuristicLab.Services.Deployment-3.3.Tests")] 33 [assembly: AssemblyCopyright(" Copyright © 2010")]33 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 34 34 [assembly: AssemblyTrademark("")] 35 35 [assembly: AssemblyCulture("")] -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/UpdateService.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/Web.config
r14748 r16311 2 2 <configuration> 3 3 <connectionStrings> 4 <add name="HeuristicLab.Authentication" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />5 <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>4 <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 5 <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/> 6 6 </connectionStrings> 7 7 … … 40 40 <host> 41 41 <baseAddresses> 42 <add baseAddress="http:// localhost:8000/Deployment-3.3/AdminService.svc"/>42 <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/AdminService.svc"/> 43 43 </baseAddresses> 44 44 </host> … … 49 49 <host> 50 50 <baseAddresses> 51 <add baseAddress="http:// localhost:8000/Deployment-3.3/UpdateService.svc"/>51 <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/UpdateService.svc"/> 52 52 </baseAddresses> 53 53 </host> … … 60 60 <serviceDebug includeExceptionDetailInFaults="true" /> 61 61 <serviceCredentials> 62 <serviceCertificate findValue=" localhost" x509FindType="FindBySubjectName" />62 <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" /> 63 63 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" 64 64 membershipProviderName="AspNetSqlMembershipProvider" /> -
branches/2845_EnhancedProgress/HeuristicLab.Services.Deployment/3.3/app.config
r14748 r16311 2 2 <configuration> 3 3 <connectionStrings> 4 <add name="HeuristicLab.Authentication" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />5 <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/>4 <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 5 <add name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_DeploymentConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Deployment"/> 6 6 </connectionStrings> 7 7 … … 40 40 <host> 41 41 <baseAddresses> 42 <add baseAddress="http:// localhost:8000/Deployment-3.3/AdminService.svc"/>42 <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/AdminService.svc"/> 43 43 </baseAddresses> 44 44 </host> … … 49 49 <host> 50 50 <baseAddresses> 51 <add baseAddress="http:// localhost:8000/Deployment-3.3/UpdateService.svc"/>51 <add baseAddress="http://services.heuristiclab.com/Deployment-3.3/UpdateService.svc"/> 52 52 </baseAddresses> 53 53 </host> … … 60 60 <serviceDebug includeExceptionDetailInFaults="true" /> 61 61 <serviceCredentials> 62 <serviceCertificate findValue=" localhost" x509FindType="FindBySubjectName" />62 <serviceCertificate findValue="services.heuristiclab.com" x509FindType="FindBySubjectName" /> 63 63 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" 64 64 membershipProviderName="AspNetSqlMembershipProvider" />
Note: See TracChangeset
for help on using the changeset viewer.