# # ChangeLog for trunk/sources/ConfigMerger.exe # # Generated by Trac 1.0.12 # 12/12/24 21:39:40 Tue, 18 May 2010 02:21:08 GMT swagner [3837] * trunk/sources/ConfigMerger.exe (modified) * trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.Designer.cs (modified) * trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.settings (modified) * trunk/sources/HeuristicLab.PluginInfrastructure/3.3/app.config (modified) * trunk/sources/HeuristicLab/3.3/Files.txt (modified) * trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) * trunk/sources/HeuristicLab/3.3/MergeConfigs.cmd (modified) * trunk/sources/HeuristicLab/3.3/Properties/Settings.Designer.cs (modified) * trunk/sources/HeuristicLab/3.3/Properties/Settings.settings (modified) * trunk/sources/HeuristicLab/3.3/app.config (modified) Restructured repository in preparation of the HeuristicLab 3.3.0 ... Wed, 07 Apr 2010 21:07:22 GMT abeham [3285] * trunk/sources/ConfigMerger.exe (modified) updated ConfigMerger.exe #962 Fri, 12 Mar 2010 09:57:21 GMT kgrading [3011] * trunk/sources/ConfigMerger.exe (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0 (modified) * trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/Reference.cs (modified) * trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) * trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) * trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs (modified) * trunk/sources/HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/CachedHivePluginInfoDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ClientConfigDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ClientDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ClientGroupDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/HivePluginInfoDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/JobDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ProjectDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ResourceDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/SerializedJob.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/UpTimeStatisticsDto.cs (added) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientCommunicator.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientFacade.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IExecutionEngineFacade.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IJobManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/ResponseJob.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/ResponsePlugin.cs (modified) * trunk/sources/HeuristicLab.Hive.Contracts/3.2/ResponseResultReceived.cs (modified) * trunk/sources/HeuristicLab.Hive.Engine/3.2/HeuristicLab.Hive.Engine-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientConfigAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientGroupAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobResultsAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/PluginInfoAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ProjectAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/Properties/Settings.Designer.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/Properties/Settings.settings (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ResourceAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/ClientAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/ClientConfigAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/ClientGroupAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/JobAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/PluginInfoAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/ProjectAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/TableAdapterWrapper/ResourceAdapterWrapper.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/dsHiveServer.Designer.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Console/3.2/AddJobForm.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/Authorization/HivePermissionManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/DaoLocator.cs (added) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/DbTestApp.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/DefaultScheduler.cs (added) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ExecutionEngineFacade.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/HeuristicLab.Hive.Server.Core-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/HiveServerCorePlugin.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/InternalInterfaces/IInternalJobManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/InternalInterfaces/IScheduler.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/HeuristicLab.Hive.Server.DataAccess-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/HiveServerDataAccessPlugin.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IClientAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IClientConfigAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IClientConfigDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IClientDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IClientGroupAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IClientGroupDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IGenericDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IJobAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IJobDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IPluginInfoAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IPluginInfoDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IProjectAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IResourceAdapter.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/VarBinaryStream.cs (added) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/BaseDao.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientConfigDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientDao.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientGroupDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ContextFactory.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml.layout (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/IClientDao.cs (deleted) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/IGenericDao.cs (deleted) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/IJobDao.cs (deleted) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/LINQDataAccessPlugin.cs (modified) * trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/PluginInfoDao.cs (added) * trunk/sources/HeuristicLab.Hive.Server.Scheduler/3.2/HeuristicLab.Hive.Server.Scheduler-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server/3.2/App.config (modified) * trunk/sources/HeuristicLab.Hive.Server/3.2/HeuristicLab.Hive.Server-3.2.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerPlugin.cs (modified) * trunk/sources/HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs (modified) * trunk/sources/HeuristicLab/app.config (modified) changed the complete DAL to LINQ 2 SQL (with the exception of the job ... Fri, 29 Jan 2010 18:16:32 GMT abeham [2725] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Fixed a bug in ConfigMerger when the bindings root node didn't exist ... Thu, 28 Jan 2010 15:23:44 GMT abeham [2698] * trunk/sources/ConfigMerger.exe (modified) Updated ConfigMerger.exe (#858) Wed, 27 Jan 2010 16:34:07 GMT gkronber [2692] * trunk/sources/ConfigMerger.exe (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SQLServerCompact/3.5.1.0/HeuristicLab.SQLServerCompact-3.5.1.0.csproj (modified) * trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs (modified) * trunk/sources/HeuristicLab/MergeConfigs.cmd (modified) * trunk/sources/HeuristicLab/app.config (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Fixed #855 (Configuration for SQL Compact DbProviderFactory should be ... Tue, 05 Jan 2010 16:26:13 GMT swagner [2602] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Improved error messages of ConfigMerger (#827) Thu, 15 Jan 2009 14:57:44 GMT gkronber [1142] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) updated configMerger to merge connectionStrings (#469) Wed, 10 Dec 2008 14:31:28 GMT kgrading [951] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) quickfix for #429 (extended the configMerger) Wed, 10 Dec 2008 13:42:39 GMT gkronber [943] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) quick fix for #428 (ConfigMerger doesn't merge system.serviceModel ... Sat, 29 Nov 2008 23:41:41 GMT swagner [876] * trunk/sources/ConfigMerger.exe (modified) Updated ConfigMerger in main solution (#409) Fri, 28 Nov 2008 20:51:20 GMT swagner [852] * trunk/sources/ConfigMerger.exe (added) * trunk/sources/HeuristicLab.AdvancedOptimizationFrontend/HeuristicLab.AdvancedOptimizationFrontend.csproj (modified) * trunk/sources/HeuristicLab.BitVector/HeuristicLab.BitVector.csproj (modified) * trunk/sources/HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj (modified) * trunk/sources/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj (modified) * trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj (modified) * trunk/sources/HeuristicLab.CEDMA.DB/HeuristicLab.CEDMA.DB.csproj (modified) * trunk/sources/HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj (modified) * trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj (modified) * trunk/sources/HeuristicLab.Charting.Data/HeuristicLab.Charting.Data.csproj (modified) * trunk/sources/HeuristicLab.Charting/HeuristicLab.Charting.csproj (modified) * trunk/sources/HeuristicLab.Communication.Data/HeuristicLab.Communication.Data.csproj (modified) * trunk/sources/HeuristicLab.Communication.Operators/HeuristicLab.Communication.Operators.csproj (modified) * trunk/sources/HeuristicLab.Constraints/HeuristicLab.Constraints.csproj (modified) * trunk/sources/HeuristicLab.Core/HeuristicLab.Core.csproj (modified) * trunk/sources/HeuristicLab.Data/HeuristicLab.Data.csproj (modified) * trunk/sources/HeuristicLab.DataAnalysis/HeuristicLab.DataAnalysis.csproj (modified) * trunk/sources/HeuristicLab.DistributedEngine/HeuristicLab.DistributedEngine.csproj (modified) * trunk/sources/HeuristicLab.ES/HeuristicLab.ES.csproj (modified) * trunk/sources/HeuristicLab.Evolutionary/HeuristicLab.Evolutionary.csproj (modified) * trunk/sources/HeuristicLab.GP.Boolean/HeuristicLab.GP.Boolean.csproj (modified) * trunk/sources/HeuristicLab.GP.SantaFe/HeuristicLab.GP.SantaFe.csproj (modified) * trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/HeuristicLab.GP.StructureIdentification.Classification.csproj (modified) * trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLab.GP.StructureIdentification.TimeSeries.csproj (modified) * trunk/sources/HeuristicLab.GP.StructureIdentification/HeuristicLab.GP.StructureIdentification.csproj (modified) * trunk/sources/HeuristicLab.GP/HeuristicLab.GP.csproj (modified) * trunk/sources/HeuristicLab.Grid/HeuristicLab.Grid.csproj (modified) * trunk/sources/HeuristicLab.Hive.Client.Common/HeuristicLab.Hive.Client.Common.csproj (modified) * trunk/sources/HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj (modified) * trunk/sources/HeuristicLab.Hive.Client.Console/HeuristicLab.Hive.Client.Console.csproj (modified) * trunk/sources/HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj (modified) * trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/HeuristicLab.Hive.Client.ExecutionEngine.csproj (modified) * trunk/sources/HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/HeuristicLab.Hive.Server.ADODataAccess.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.Console/HeuristicLab.Hive.Server.Console.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server.Scheduler/HeuristicLab.Hive.Server.Scheduler.csproj (modified) * trunk/sources/HeuristicLab.Hive.Server/HeuristicLab.Hive.Server.csproj (modified) * trunk/sources/HeuristicLab.Logging/HeuristicLab.Logging.csproj (modified) * trunk/sources/HeuristicLab.Operators.Metaprogramming/HeuristicLab.Operators.Metaprogramming.csproj (modified) * trunk/sources/HeuristicLab.Operators.Programmable/HeuristicLab.Operators.Programmable.csproj (modified) * trunk/sources/HeuristicLab.Operators.Stopwatch/HeuristicLab.Operators.Stopwatch.csproj (modified) * trunk/sources/HeuristicLab.Operators/HeuristicLab.Operators.csproj (modified) * trunk/sources/HeuristicLab.OptimizationFrontend/HeuristicLab.OptimizationFrontend.csproj (modified) * trunk/sources/HeuristicLab.Permutation/HeuristicLab.Permutation.csproj (modified) * trunk/sources/HeuristicLab.PluginInfrastructure.GUI/HeuristicLab.PluginInfrastructure.GUI.csproj (modified) * trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj (modified) * trunk/sources/HeuristicLab.Random/HeuristicLab.Random.csproj (modified) * trunk/sources/HeuristicLab.RealVector/HeuristicLab.RealVector.csproj (modified) * trunk/sources/HeuristicLab.Routing.TSP/HeuristicLab.Routing.TSP.csproj (modified) * trunk/sources/HeuristicLab.SGA/HeuristicLab.SGA.csproj (modified) * trunk/sources/HeuristicLab.SQLite/HeuristicLab.SQLite.csproj (modified) * trunk/sources/HeuristicLab.Scheduling.JSSP/HeuristicLab.Scheduling.JSSP.csproj (modified) * trunk/sources/HeuristicLab.Selection.OffspringSelection/HeuristicLab.Selection.OffspringSelection.csproj (modified) * trunk/sources/HeuristicLab.Selection/HeuristicLab.Selection.csproj (modified) * trunk/sources/HeuristicLab.SequentialEngine/HeuristicLab.SequentialEngine.csproj (modified) * trunk/sources/HeuristicLab.Settings/HeuristicLab.Settings.csproj (modified) * trunk/sources/HeuristicLab.SimOpt/HeuristicLab.SimOpt.csproj (modified) * trunk/sources/HeuristicLab.TestFunctions/HeuristicLab.TestFunctions.csproj (modified) * trunk/sources/HeuristicLab.ThreadParallelEngine/HeuristicLab.ThreadParallelEngine.csproj (modified) * trunk/sources/HeuristicLab.Visualization.Test/HeuristicLab.Visualization.Test.csproj (modified) * trunk/sources/HeuristicLab.Visualization/HeuristicLab.Visualization.csproj (modified) * trunk/sources/HeuristicLab.sln (modified) * trunk/sources/HeuristicLab/CopyAssemblies.cmd (modified) * trunk/sources/HeuristicLab/HeuristicLab.csproj (modified) * trunk/sources/HeuristicLab/MergeConfigs.cmd (added) * trunk/sources/HeuristicLab/UpdateLocalInstallation.cmd (modified) * trunk/sources/PreBuildEvent.cmd (modified) * trunk/tools/ConfigMerger/ConfigMerger.csproj (modified) * trunk/tools/PreBuildEvent.cmd (modified) Integrated ConfigMerger into build process (#403). Refactored pre- ...