Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 60344 invoked from network); 5 Aug 2010 17:01:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Aug 2010 17:01:37 -0000 Received: (qmail 67613 invoked by uid 500); 5 Aug 2010 17:01:37 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 67567 invoked by uid 500); 5 Aug 2010 17:01:36 -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 67559 invoked by uid 99); 5 Aug 2010 17:01:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Aug 2010 17:01:36 +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, 05 Aug 2010 17:01:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 253BF2388A36; Thu, 5 Aug 2010 17:00:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r982694 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Date: Thu, 05 Aug 2010 17:00:17 -0000 To: commits@cxf.apache.org From: asoldano@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100805170017.253BF2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asoldano Date: Thu Aug 5 17:00:16 2010 New Revision: 982694 URL: http://svn.apache.org/viewvc?rev=982694&view=rev Log: Merged revisions 982687 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r982687 | asoldano | 2010-08-05 18:51:25 +0200 (Thu, 05 Aug 2010) | 2 lines [CXF-2929] Renaming added method ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 5 17:00:16 2010 @@ -1 +1 @@ -/cxf/trunk:980898-980941,981508,981804,982153,982413,982491,982532 +/cxf/trunk:980898-980941,981508,981804,982153,982413,982491,982532,982687 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=982694&r1=982693&r2=982694&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original) +++ cxf/branches/2.2.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Thu Aug 5 17:00:16 2010 @@ -465,7 +465,7 @@ public class RMManager implements Server return new RMEndpoint(this, endpoint); } - public void initialise(Bus b) { + public void init(Bus b) { setBus(b); initialise(); registerListeners();