commit | 89807878fa57a4be1cbd6ea5d1b929472e64b41d | [log] [tgz] |
---|---|---|
author | Zhaohui Feng <rfeng@apache.org> | Fri Nov 16 06:50:58 2012 +0000 |
committer | Zhaohui Feng <rfeng@apache.org> | Fri Nov 16 06:50:58 2012 +0000 |
tree | a6c4d2cc720c2d2c500fe3d4fdcd478083d186d4 | |
parent | 7768ed9c95759d3b089fafeeebf6c5a56c6e687d [diff] |
Fix the spring delegation git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk@1410212 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAGenericApplicationContext.java b/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAGenericApplicationContext.java index 44a3ee2..35524bb 100644 --- a/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAGenericApplicationContext.java +++ b/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAGenericApplicationContext.java
@@ -31,6 +31,7 @@ import org.apache.tuscany.sca.implementation.spring.SpringSCAServiceElement; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; +import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanReference; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -61,6 +62,13 @@ this.classloader = classloader; } + /** + * Force the parent bean factory to be the SCA parent context itself + */ + protected BeanFactory getInternalParentBeanFactory() { + return getParent(); + } + @Override protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { beanFactory.setBeanClassLoader(classloader);
diff --git a/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java b/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java index 2829891..654d0c6 100644 --- a/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java +++ b/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java
@@ -60,12 +60,6 @@ this.implementation = implementation; } // end constructor - - protected BeanFactory getInternalParentBeanFactory() { - // Disable the parent delegation as we'll handle it inside the getBean() - return null; - } - public Object getBean(String name) throws BeansException { return getBean(name, (Class)null); }