svn commit: r1156222 - in /cxf/branches/2.4.x-fixes: ./ common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java

[dkulp]

Author: dkulp
Date: Wed Aug 10 15:19:07 2011
New Revision: 1156222

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

........
  r1156219 | dkulp | 2011-08-10 11:16:52 -0400 (Wed, 10 Aug 2011) | 1 line
  
  [CXF-3727] Wire in depends-on to factory beans
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java

Propchange: cxf/branches/2.4.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java?rev=1156222&r1=1156221&r2=1156222&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
 Wed Aug 10 15:19:07 2011
@@ -67,6 +67,9 @@ public abstract class AbstractFactoryBea
             } else if ("abstract".equals(name)) {
                 factoryBean.setAbstract(true);
                 bean.setAbstract(true);
+            } else  if ("depends-on".equals(name)) {
+                factoryBean.addDependsOn(val);
+                bean.addDependsOn(val);
             } else if (!"id".equals(name) && !"name".equals(name) && 
isAttribute(pre, name)) {
                 if ("bus".equals(name)) {
                     setBus = true;