Changeset 6173 for trunk/tools/ConfigMerger/ConfigMerger.cs

Timestamp:

05/10/11 12:24:33 (13 years ago)

Author:

ascheibe

Message:

#1517

• rewrote Logger to use Diagnostics.Trace
• removed HiveLogger as it's not used anymore
• removed dependency from Persistence to log4net
• ConfigMerger now also merges <system.diagnostics> sections

File:

• trunk/tools/ConfigMerger/ConfigMerger.cs (modified) (3 diffs)

trunk/tools/ConfigMerger/ConfigMerger.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Xml;
@@ -69 +67 @@
       destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/services");
       Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel");
-      
+
       #region Merge 'system.serviceModel/bindings/*'
       destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/bindings");
@@ -184 +182 @@
       destinationNode = destination.SelectSingleNode("/configuration/system.data/DbProviderFactories");
       Merge(sourceNode, destinationNode, destination, "/configuration");
+
+      sourceNode = source.SelectSingleNode("/configuration/system.diagnostics");
+      destinationNode = destination.SelectSingleNode("/configuration/system.diagnostics");
+      Merge(sourceNode, destinationNode, destination, "/configuration");
+
+
+
 
       destination.Save(destinationFile);