Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 7072 invoked from network); 11 Feb 2010 05:34:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Feb 2010 05:34:19 -0000 Received: (qmail 14199 invoked by uid 500); 11 Feb 2010 05:34:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14121 invoked by uid 500); 11 Feb 2010 05:34:19 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14112 invoked by uid 99); 11 Feb 2010 05:34:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Feb 2010 05:34:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Feb 2010 05:34:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 36DC923889D7; Thu, 11 Feb 2010 05:33:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r908845 - in /cxf/branches/2.1.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml Date: Thu, 11 Feb 2010 05:33:55 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100211053355.36DC923889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Thu Feb 11 05:33:54 2010 New Revision: 908845 URL: http://svn.apache.org/viewvc?rev=908845&view=rev Log: Merged revisions 908843 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r908843 | ningjiang | 2010-02-11 13:21:43 +0800 (Thu, 11 Feb 2010) | 9 lines Merged revisions 908779 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r908779 | ningjiang | 2010-02-11 09:06:10 +0800 (Thu, 11 Feb 2010) | 1 line CXF-2667 supporting not to specify the name attribute for bus configure ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 11 05:33:54 2010 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:908559 -/cxf/trunk:908549 +/cxf/branches/2.2.x-fixes:908559,908843 +/cxf/trunk:908549,908779 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=908845&r1=908844&r2=908845&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Thu Feb 11 05:33:54 2010 @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Element; @@ -41,6 +42,7 @@ import org.springframework.context.ApplicationContextAware; public class BusDefinitionParser extends AbstractBeanDefinitionParser { + private static AtomicInteger counter = new AtomicInteger(0); public BusDefinitionParser() { super(); @@ -76,7 +78,7 @@ protected String getIdOrName(Element elem) { String id = super.getIdOrName(elem); if (StringUtils.isEmpty(id)) { - id = Bus.DEFAULT_BUS_ID + ".config"; + id = Bus.DEFAULT_BUS_ID + ".config" + counter.getAndIncrement(); } return id; } Modified: cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml?rev=908845&r1=908844&r2=908845&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml Thu Feb 11 05:33:54 2010 @@ -28,13 +28,13 @@ - + - +