Author: dkulp Date: Thu Aug 11 01:32:13 2011 New Revision: 1156432 URL: http://svn.apache.org/viewvc?rev=1156432&view=rev Log: Merged revisions 1156222 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1156222 | dkulp | 2011-08-10 11:19:07 -0400 (Wed, 10 Aug 2011) | 9 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java?rev=1156432&r1=1156431&r2=1156432&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java (original) +++ cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java Thu Aug 11 01:32:13 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;
