Revert the wrong change

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

1 files changed, 6 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
index 818bc4e102..290bbff171 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
@@ -22,7 +22,7 @@ package org.apache.tuscany.sca.implementation.spring.invocation;
 import java.lang.reflect.Constructor;

 import java.lang.reflect.InvocationTargetException;

 import java.lang.reflect.Method;

-import java.net.URL;

+import java.util.List;

 

 import org.apache.tuscany.sca.core.invocation.ProxyFactory;

 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

@@ -47,10 +47,9 @@ public class SpringContextStub {
                                ProxyFactory proxyService,

                                JavaPropertyValueObjectFactory propertyValueObjectFactory,

                                boolean annotationSupport,

-                               String versionSupported,

-                               boolean multipleContextSupport) {

+                               String versionSupported) {

 

-        initTie(component, implementation, propertyValueObjectFactory, annotationSupport, versionSupported, multipleContextSupport);        

+        initTie(component, implementation, propertyValueObjectFactory, annotationSupport, versionSupported);        

 

     }

 

@@ -58,8 +57,7 @@ public class SpringContextStub {
                          SpringImplementation implementation,

                          JavaPropertyValueObjectFactory propertyValueObjectFactory,

                          boolean annotationSupport,

-                         String versionSupported,

-                         boolean multipleContextSupport) {

+                         String versionSupported) {

 

         // TODO: what class loader to use?

         ClassLoader cl = Thread.currentThread().getContextClassLoader();

@@ -71,8 +69,8 @@ public class SpringContextStub {
             Object stub = stubConstructor.newInstance(new SpringImplementationTie(implementation, component, propertyValueObjectFactory));

 

             Class<?> tieClass = Class.forName("org.apache.tuscany.sca.implementation.spring.runtime.context.SpringContextTie", true, cl);

-            Constructor<?> tieConstructor = tieClass.getConstructor(new Class<?>[]{stubClass, URL.class, boolean.class, String.class, boolean.class});

-            this.tie = tieConstructor.newInstance(stub, implementation.getResource(), annotationSupport, versionSupported, multipleContextSupport);

+            Constructor<?> tieConstructor = tieClass.getConstructor(new Class<?>[]{stubClass, List.class, boolean.class, String.class});

+            this.tie = tieConstructor.newInstance(stub, implementation.getResource(), annotationSupport, versionSupported);

             

             this.startMethod = tieClass.getMethod("start");

             this.closeMethod = tieClass.getMethod("close");