Author: ay Date: Thu Dec 6 08:45:47 2012 New Revision: 1417776 URL: http://svn.apache.org/viewvc?rev=1417776&view=rev Log: Merged revisions 1417772 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1417772 | ay | 2012-12-06 09:42:05 +0100 (Thu, 06 Dec 2012) | 9 lines Merged revisions 1417769 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1417769 | ay | 2012-12-06 09:38:45 +0100 (Thu, 06 Dec 2012) | 1 line [CXF-4683] workqueue configuration in BP does not derive the id attribute from the name attribute ........ ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1417776&r1=1417775&r2=1417776&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java Thu Dec 6 08:45:47 2012 @@ -76,7 +76,7 @@ public class CXFCoreNamespaceHandler imp id = "cxf.workqueue."; id += element.hasAttribute("name") ? element.getAttribute("name") : "def"; } - return super.getId(element, context); + return id; } protected void processNameAttribute(Element element, ParserContext ctx,
