8 files changed, 23 insertions, 8 deletions
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index 7c84965629..4532810433 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
@@ -35,5 +35,8 @@
     <sca:reference name="subtractService" type="calculator.SubtractService"/>   
     <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    
     <sca:reference name="divideService" type="calculator.DivideService"/>
+    
+    <bean id="AddServiceBean" class="calculator.AddServiceImpl">
+    </bean>
 
 </beans>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index 3faed92fd2..6dbcef46a6 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
@@ -26,4 +26,16 @@
        
     <import resource="CalculatorService-context.xml"/>
     
+    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        
+        <property name="addService" ref="addService"/>
+        <property name="subtractService" ref="subtractService"/>
+        <property name="multiplyService" ref="multiplyService"/>
+        <property name="divideService" ref="divideService"/>
+    </bean>
+    
+    <sca:reference name="addService" type="calculator.AddService"/>
+    <sca:reference name="subtractService" type="calculator.SubtractService"/>   
+    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    
+    <sca:reference name="divideService" type="calculator.DivideService"/>
+    
 </beans>
 \ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
index 50d6456737..c6f2111d0e 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
@@ -28,11 +28,11 @@
     
     <component name="ClientComponent">
         <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
+        <reference name="delegate" target="HelloWorldComponent/testBean1"/>
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="springapp"/>
+        <implementation.spring location="springapp"/>        
         <property name="TestProperty">Hello</property>
     </component>
 
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite
index dafa671288..b0efbfd5b7 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite
@@ -28,7 +28,7 @@
     
     <component name="ClientComponent">
         <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
+        <reference name="delegate" target="HelloWorldComponent/testBean1"/>
     </component>
 
     <component name="HelloWorldComponent">
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
index b0b191801d..7b16c221cf 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
@@ -28,7 +28,7 @@
     
     <component name="ClientComponent">
         <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
+        <reference name="delegate" target="HelloWorldComponent/testBean1"/>
     </component>
 
     <component name="HelloWorldComponent">
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite
index addb4655fc..c3d49757eb 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite
@@ -28,7 +28,7 @@
     
     <component name="ClientComponent">
         <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
+        <reference name="delegate" target="HelloWorldComponent/testBean1"/>
     </component>
 
     <component name="HelloWorldComponent">
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index bd050135da..7d72242df3 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
@@ -21,8 +21,8 @@
            name="SpringHelloWorld">
 
     <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
+        <implementation.java class="helloworld.HelloWorldProxy"/>
+        <reference name="delegate" target="HelloWorldComponent/testBean"/>
     </component>
 
     <component name="HelloWorldComponent">
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 1047d2a210..847056adf6 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
@@ -21,7 +21,7 @@
            name="SpringHelloWorld">
 
     <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
+        <implementation.java class="helloworld.HelloWorldProxy"/>
         <reference name="delegate" target="HelloWorldComponent"/>
     </component>