svn commit: r1155419 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java

[dkulp]

Author: dkulp
Date: Tue Aug  9 15:58:19 2011
New Revision: 1155419

URL: http://svn.apache.org/viewvc?rev=1155419&view=rev
Log:
Merged revisions 1155417 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1155417 | dkulp | 2011-08-09 11:55:52 -0400 (Tue, 09 Aug 2011) | 2 lines
  
  [CXF-3724] Enhance how the Jsr250BeanPostProcessor grabs the resource
  manager
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=1155419&r1=1155418&r2=1155419&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
 Tue Aug  9 15:58:19 2011
@@ -69,6 +69,16 @@ public class Jsr250BeanPostProcessor 
             if (bean instanceof ResourceManager) {
                 resourceManager = (ResourceManager)bean;
                 resourceManager.addResourceResolver(new 
BusApplicationContextResourceResolver(context));
+            } else if (bean instanceof Bus) {
+                Bus b = (Bus)bean;
+                ResourceManager m = b.getExtension(ResourceManager.class);
+                if (resourceManager == null && m != null) {
+                    resourceManager = m;
+                    if (!(b instanceof SpringBus)) {
+                        resourceManager
+                            .addResourceResolver(new 
BusApplicationContextResourceResolver(context));
+                    }
+                }
             } else {
                 ResourceManager m = null;
                 Bus b = null;