Fixes in 1.x for TUSCANY-3069

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

9 files changed, 5 insertions, 5 deletions

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite
index 03116905fc..4704239620 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite
@@ -24,7 +24,7 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

 

     <component name="CalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/context-access/CalculatorService-context.xml"/>

+        <implementation.spring location="CalculatorService-context.xml"/>

         <reference name="addService" target="AddServiceComponent" />

         <reference name="subtractService" target="SubtractServiceComponent" />

         <reference name="multiplyService" target="MultiplyServiceComponent" />

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite
index 709de34a34..6662531971 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite
@@ -24,7 +24,7 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

 

     <component name="CalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/context-imports/SpringImport-context.xml"/>

+        <implementation.spring location="META-INF/spring/SpringImport-context.xml"/>

         <reference name="addService" target="AddServiceComponent" />

         <reference name="subtractService" target="SubtractServiceComponent" />

         <reference name="multiplyService" target="MultiplyServiceComponent" />

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/CalculatorService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index 3faed92fd2..3faed92fd2 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
index 74473073ea..74473073ea 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
index 930b92f4be..8d86820d44 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
@@ -27,8 +27,8 @@
     <bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">

 	   <constructor-arg>

 		  <list>

-			 <value>META-INF/sca/context-multiple/StockQuoteService-context.xml</value>

-			 <value>META-INF/sca/context-multiple/SpringHelloWorld-context.xml</value>

+			 <value>context/multiple/META-INF/spring/StockQuoteService-context.xml</value>

+			 <value>context/multiple/META-INF/spring/SpringHelloWorld-context.xml</value>

 		  </list>

 	   </constructor-arg>

     </bean>

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite
index 780795a7a0..eb40f30b3c 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite
@@ -29,7 +29,7 @@
     </service>

 

     <component name="StockQuoteServiceComponent">

-        <implementation.spring location="META-INF/sca/context-multiple/beanRefContext.xml"/>

+        <implementation.spring location="META-INF/spring/beanRefContext.xml"/>

     </component>

 

 </composite>