Update the context accessor spi and dependencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@987669 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringApplicationContextAccessor.java b/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SpringApplicationContextAccessor.java
index a9b6dd151a..2d18b5aa6c 100644
--- a/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringApplicationContextAccessor.java
+++ b/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SpringApplicationContextAccessor.java
@@ -17,7 +17,9 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.spring.provider;
+package org.apache.tuscany.sca.implementation.spring.context;
+
+import org.springframework.context.ApplicationContext;
 
 /**
  * A utility to receive the parent Spring application context 
@@ -28,12 +30,12 @@ public interface SpringApplicationContextAccessor {
      * application context for implementation.spring components
      * @return The parent application context
      */
-    Object getParentApplicationContext();
+    ApplicationContext getParentApplicationContext();
 
     /**
      * 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(Object parentApplicationContext);
+    void setParentApplicationContext(ApplicationContext parentApplicationContext);
 }
diff --git a/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java b/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
index 8ad07280a7..be16fb3251 100644
--- a/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
+++ b/sca-java-2.x/trunk/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
@@ -24,6 +24,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
 import org.apache.tuscany.sca.core.invocation.ProxyFactory;
 import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
+import org.apache.tuscany.sca.implementation.spring.context.SpringApplicationContextAccessor;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -61,7 +62,7 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
     public ImplementationProvider createImplementationProvider(RuntimeComponent component,
                                                                SpringImplementation implementation) {
         ApplicationContext parentApplicationContext =
-            (contextAccessor != null) ? (ApplicationContext)contextAccessor.getParentApplicationContext() : null;
+            (contextAccessor != null) ? contextAccessor.getParentApplicationContext() : null;
         SpringImplementationWrapper tie =
             new SpringImplementationWrapper(implementation, parentApplicationContext, component, propertyFactory);
         return new SpringImplementationProvider(component, tie, parentApplicationContext, proxyFactory, propertyFactory);