svn commit: r982694 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java

[asoldano]

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();