Author: ay Date: Tue Jan 21 18:13:21 2014 New Revision: 1560122 URL: http://svn.apache.org/r1560122 Log: Merged revisions 1560120 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1560120 | ay | 2014-01-21 19:10:58 +0100 (Tue, 21 Jan 2014) | 10 lines Merged revisions 1560119 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1560119 | ay | 2014-01-21 19:08:40 +0100 (Tue, 21 Jan 2014) | 2 lines [CXF-5507] Missing alternativeSelector handling in ws-policy feature's blueprint configuration ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java?rev=1560122&r1=1560121&r2=1560122&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java Tue Jan 21 18:13:21 2014 @@ -61,6 +61,13 @@ public class PolicyFeatureBPDefinitionPa return cxfBean; } + @Override + protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) { + if ("alternativeSelector".equals(name)) { + setFirstChildAsProperty(el, ctx, bean, name); + } + } + public static Metadata createElement(ParserContext context, Element value) { MutablePassThroughMetadata anElement = context.createMetadata(MutablePassThroughMetadata.class); anElement.setObject(value);
