diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main')
2 files changed, 4 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SpringApplicationContextAccessor.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SpringApplicationContextAccessor.java index 2d18b5aa6c..f4820ea9a0 100644 --- a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SpringApplicationContextAccessor.java +++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SpringApplicationContextAccessor.java @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.implementation.spring.context; +import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.springframework.context.ApplicationContext; /** @@ -28,14 +29,9 @@ public interface SpringApplicationContextAccessor { /** * Get the parent Spring application context for the hosting environment. This will be used as the parent * application context for implementation.spring components + * @param component The Spring component instance * @return The parent application context */ - ApplicationContext getParentApplicationContext(); + ApplicationContext getParentApplicationContext(RuntimeComponent component); - /** - * Set the root Spring application context. This is particually useful for Spring web integration where Spring - * creates WebApplicationContext and keeps it in the ServletContext - * @param parentApplicationContext The parent application context - */ - void setParentApplicationContext(ApplicationContext parentApplicationContext); } diff --git a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java index be16fb3251..ad395323c5 100644 --- a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java +++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java @@ -62,7 +62,7 @@ public class SpringImplementationProviderFactory implements ImplementationProvid public ImplementationProvider createImplementationProvider(RuntimeComponent component, SpringImplementation implementation) { ApplicationContext parentApplicationContext = - (contextAccessor != null) ? contextAccessor.getParentApplicationContext() : null; + (contextAccessor != null) ? contextAccessor.getParentApplicationContext(component) : null; SpringImplementationWrapper tie = new SpringImplementationWrapper(implementation, parentApplicationContext, component, propertyFactory); return new SpringImplementationProvider(component, tie, parentApplicationContext, proxyFactory, propertyFactory); |