Changeset 3284


Ignore:
Timestamp:
04/07/10 22:48:46 (11 years ago)
Author:
abeham
Message:

updated ConfigMerger by merging behaviors separately #962

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/ConfigMerger/ConfigMerger.cs

    r2725 r3284  
    4646      XmlNode destinationNode;
    4747
    48       sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/behaviors");
     48      #region Merge 'system.serviceModel/behaviors/*'
    4949      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/behaviors");
    50       Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel");
     50      if (destinationNode == null) {
     51        destinationNode = destination.CreateElement("behaviors");
     52        destination.SelectSingleNode("/configuration/system.serviceModel").AppendChild(destinationNode);
     53      }
     54
     55      sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/behaviors/endpointBehaviors");
     56      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/behaviors/endpointBehaviors");
     57      Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel/behaviors");
     58
     59      sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/behaviors/serviceBehaviors");
     60      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/behaviors/serviceBehaviors");
     61      Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel/behaviors");
     62      #endregion
    5163
    5264      sourceNode = source.SelectSingleNode("/configuration/system.serviceModel/services");
Note: See TracChangeset for help on using the changeset viewer.