Fixes in 1.x for TUSCANY-3069

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

45 files changed, 149 insertions, 128 deletions

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <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>

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>

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite
index 0551dc60ef..98cd9ec225 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/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/implementation-policies/CalculatorService-context.xml">		

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

 			<operation name="divide" requires="tuscany:logging"/>

 			<operation name="subtract" requires="tuscany:logging"/>

 		</implementation.spring>

@@ -51,7 +51,7 @@
     </component>

     

     <component name="AnotherCalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml" requires="tuscany:logging"/>		

+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml" requires="tuscany:logging"/>		

         <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-imports/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
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 7f6268f6b5..50d6456737 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
@@ -32,7 +32,7 @@
     </component>

 

     <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/location-folder"/>

+        <implementation.spring location="springapp"/>

         <property name="TestProperty">Hello</property>

     </component>

 

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
index d2f406294d..d2f406294d 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
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 1f8792e4d8..b0b191801d 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
@@ -32,7 +32,7 @@
     </component>

 

     <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/location-jar/spring-context.jar"/>

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

         <property name="TestProperty">Hello</property>

     </component>

 

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar
index d8ee59a610..d8ee59a610 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
index 18ab7e332d..932ebb1361 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="delegateBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-    <bean id="testBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true">
-         <property name="delegate"><ref bean="delegateBean"/></property>
-    </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<!-- Application context for the SpringHelloWorld testcase -->

+<beans xmlns="http://www.springframework.org/schema/beans"

+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+       xmlns:sca="http://www.springframework.org/schema/sca"

+       xsi:schemaLocation="

+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

+http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="delegateBean" 

+         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">

+    </bean>

+

+    <bean id="testBean" 

+         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true">

+         <property name="delegate"><ref bean="delegateBean"/></property>

+    </bean>

+

 </beans>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..c20679241f 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<!-- Application context for the SpringHelloWorld testcase -->

+<beans xmlns="http://www.springframework.org/schema/beans"

+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+       xmlns:sca="http://www.springframework.org/schema/sca"

+       xsi:schemaLocation="

+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

+http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

+

+    <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">

+    </bean>

+

 </beans>
\ No newline at end of file
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 70b2d5fdab..bd050135da 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
@@ -26,7 +26,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringDelegationHelloWorld-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringDelegationHelloWorld-context.xml"/>
     </component>
 
 </composite>
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 bab9ecb528..1047d2a210 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
@@ -26,7 +26,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringHelloWorld-context.xml"/>
     </component>
 
 </composite>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
index d18d8312e3..d18d8312e3 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
index df4b9b28cf..df4b9b28cf 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
index ea0d002414..25adcc183e 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
@@ -21,7 +21,7 @@
            name="SpringExplicitReference">

 

     <component name="ClientComponent">

-        <implementation.spring location="META-INF/sca/sca-references/SpringExplicitReference-context.xml"/>

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

         <reference name="testReference" target="ReferenceComponent"/>

     </component>

 

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
index 256eeb2dcc..31429e5f63 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
@@ -28,7 +28,7 @@
            name="SpringImplicitReference">

 

     <component name="ClientComponent">

-        <implementation.spring location="META-INF/sca/sca-references/SpringImplicitReference-context.xml"/>

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

         <reference name="testReference" target="ReferenceComponent"/>

     </component>

 

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
index 194bc4bcc9..194bc4bcc9 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
index 1c63311367..1c63311367 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
index 5f851517e8..6958c28361 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
@@ -27,7 +27,7 @@
     </component>

 

     <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/sca-services/SpringExplicitService-context.xml"/>

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

     </component>

 

 </composite>

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
index 482c81df23..3969eef213 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
@@ -26,7 +26,7 @@
     </component>

 

     <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/sca-services/SpringImplicitService-context.xml"/>

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

     </component>

 

 </composite>

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite
index a8a1f5b703..2c0de830ab 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/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/spring-annotation/CalculatorService-context.xml"/>

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

         <property name="message">HelloWorld</property>

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

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

diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
+++ b/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
index 75b296bf32..3ea2d0c207 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
@@ -19,11 +19,12 @@
 package context.multiple;

 

 import junit.framework.TestCase;

-

+import org.junit.Ignore;

 /**

  * Tests out the big bank service

  *

  */

+@Ignore("TUSCANY-3069")

 public class MultipleContextTestCase extends TestCase {

 

     public void testServer() throws Exception {

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
index ca64d5fcb9..0f4d9f7c42 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
@@ -18,6 +18,9 @@
  */

 package context.multiple;

 

+import java.io.File;

+

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode;

 import org.apache.tuscany.sca.node.SCANodeFactory;

 import org.springframework.context.ApplicationContext;

@@ -34,7 +37,8 @@ public class StockQuoteServer {
         System.out.println("Starting the Sample SCA StockQuote Service...");

 

         SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANodeFromClassLoader("context/multiple/StockQuote.composite", StockQuoteServer.class.getClassLoader());

+        SCANode node = factory.createSCANode(new File("src/main/resources/context/multiple/StockQuote.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/context/multiple/").toURL().toString()));

         node.start();

         

         // Method 1: To access the Spring Application Context instance

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
index 27e634d301..bc29f54d86 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
@@ -46,8 +46,9 @@ public class CalculatorClient {
         }

 

         SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANodeFromClassLoader("implementation/policies/Calculator.composite", CalculatorServiceImpl.class.getClassLoader());

-        node.start();        

+        SCANode node = factory.createSCANode(new File("src/main/resources/implementation/policies/Calculator.composite").toURL().toString(),

+                new SCAContribution("TestContribution", new File("src/main/resources/implementation/policies/").toURL().toString()));

+        node.start();       

               

         CalculatorService calculatorService = 

             ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index 88ac2e8cb5..bd1150e99a 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
@@ -37,5 +37,9 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
  */

 public class SpringFolderLocationTestCase extends AbstractHelloWorldTestCase {

     // super class does it all getting composite based on this class name

+	

+	public SpringFolderLocationTestCase() {

+        super("SpringFolderLocation.composite", "location/folder");        

+    }

 }

 

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index e3600a355c..102cd69874 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
@@ -37,5 +37,9 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
  */

 public class SpringJarLocationTestCase extends AbstractHelloWorldTestCase {

     // super class does it all getting composite based on this class name

+	

+	public SpringJarLocationTestCase() {

+        super("SpringJarLocation.composite", "location/jar");        

+    }

 }

 

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 634e3d34af..aa63fbd5c2 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.itest.spring;
 
-
 /**
  * Basic "hello world" style test case for testing Spring component implementation
  *
@@ -29,6 +28,10 @@ public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<Hel
     /**
      * Calls the hello world service and checks that it gives the right response...
      */
+	public AbstractHelloWorldTestCase(String compositeName, String contributionLocation) {
+        super(compositeName, contributionLocation);        
+    }
+	
     public void testHello() throws Exception {
         assertEquals("Hello petra", service.sayHello("petra"));
     }
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index aeb7918add..e9fc938d7c 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
@@ -21,16 +21,36 @@ package org.apache.tuscany.sca.itest.spring;
 
 import junit.framework.TestCase;
 
+import java.io.File;
+import java.net.MalformedURLException;
+
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 public abstract class AbstractSCATestCase<T> extends TestCase {
 
     protected SCADomain domain;
+    protected String compositeName;
+    protected String contributionLocation;
     protected T service;
+    
+    public AbstractSCATestCase(String compositeName, String contributionLocation) {
+        super();
+        this.compositeName = compositeName;
+        this.contributionLocation = contributionLocation;
+        try {
+            if (contributionLocation != null) {
+                File f = new File("target/classes/" + contributionLocation);
+                this.contributionLocation = f.toURL().toString();
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+    }
 
     @Override
     protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
+    	domain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName);
+        //domain = SCADomain.newInstance(getCompositeName());
         service = domain.getService(getServiceClass(), "ClientComponent");
     }
 
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 4088691ccd..11ed16e6b4 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
@@ -28,4 +28,8 @@ package org.apache.tuscany.sca.itest.spring;
  */
 public class SpringDelegationHelloWorldTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringDelegationHelloWorldTestCase() {
+        super("SpringDelegationHelloWorld.composite", "org/apache/tuscany/sca/itest/spring");        
+    }
 }
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index 840bf59b73..bec19b76de 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
@@ -29,4 +29,8 @@ package org.apache.tuscany.sca.itest.spring;
  */
 public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringHelloWorldTestCase() {
+        super("SpringHelloWorld.composite", "org/apache/tuscany/sca/itest/spring");        
+    }
 }
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 9bc12c3e7b..603d2524f6 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
@@ -38,4 +38,8 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
  */

 public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase {

     // super class does it all getting composite based on this class name

+	

+	public SpringExplicitReferenceTestCase() {

+        super("SpringExplicitReference.composite", "sca/references");        

+    }

 }

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 52ea64a3ed..757f12c08b 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
@@ -39,6 +39,10 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
  */

 public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase {

     // super class does it all getting composite based on this class name

+	

+	public SpringImplicitReferenceTestCase() {

+        super("SpringImplicitReference.composite", "sca/references");        

+    }

 }

 

 

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index 35f44b2af7..03af1e6b12 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
@@ -33,4 +33,8 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
  */

 public class SpringExplicitServiceTestCase extends AbstractHelloWorldTestCase {

     // super class does it all getting composite based on this class name

+	

+	public SpringExplicitServiceTestCase() {

+        super("SpringExplicitService.composite", "sca/services");        

+    }

 }

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 488bdcb202..6f17be1970 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
@@ -31,4 +31,8 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
  */

 public class SpringImplicitServiceTestCase extends AbstractHelloWorldTestCase {

     // super class does it all getting composite based on this class name

+	

+	public SpringImplicitServiceTestCase() {

+        super("SpringImplicitService.composite", "sca/services");        

+    }

 }

diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
index c21561a962..34e10de85b 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
@@ -27,7 +27,6 @@ import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;

 

 import calculator.CalculatorService;

-import calculator.CalculatorServiceImpl;

 

 

 /**