Changeset 3284 for trunk

Timestamp:

04/07/10 22:48:46 (15 years ago)

Author:

abeham

Message:

updated ConfigMerger by merging behaviors separately #962

File:

• trunk/tools/ConfigMerger/ConfigMerger.cs (modified) (1 diff)

trunk/tools/ConfigMerger/ConfigMerger.cs

@@ -46 +46 @@
       XmlNode destinationNode;
 
-      sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/behaviors");
+      #region Merge 'system.serviceModel/behaviors/*'
       destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/behaviors");
-      Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel");
+      if (destinationNode == null) {
+        destinationNode = destination.CreateElement("behaviors");
+        destination.SelectSingleNode("/configuration/system.serviceModel").AppendChild(destinationNode);
+      }
+
+      sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/behaviors/endpointBehaviors");
+      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/behaviors/endpointBehaviors");
+      Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel/behaviors");
+
+      sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/behaviors/serviceBehaviors");
+      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/behaviors/serviceBehaviors");
+      Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel/behaviors");
+      #endregion
 
       sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/services");