Moving 2.x contribs

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

51 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
index 6ed1840b6b..6ed1840b6b 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
index 4e1c861910..4e1c861910 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
index d654d1172a..d654d1172a 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
index 5f7614a68e..5f7614a68e 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
index a025d23b9f..a025d23b9f 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
index 178f538339..178f538339 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
index ae5093dbea..ae5093dbea 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
index f780c71549..f780c71549 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
index eb83a92f6a..eb83a92f6a 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
index a195549851..a195549851 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
index b63518d1c7..b63518d1c7 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6edfc3b6ca..6edfc3b6ca 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index d782384ce6..d782384ce6 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index c9b30b1688..c9b30b1688 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index 935ff19992..935ff19992 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 65ab096855..65ab096855 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index 0c912fddfa..0c912fddfa 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
index d77f183a66..d77f183a66 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 86f979fe15..86f979fe15 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 44016ad249..44016ad249 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 74dcf32723..74dcf32723 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 97f91ff91e..97f91ff91e 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
index bfe3d64cf3..bfe3d64cf3 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 2c46f8c066..2c46f8c066 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 4d60bffef8..4d60bffef8 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index acad9f2fea..acad9f2fea 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
index 79de2b32a0..79de2b32a0 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f165bb8b75..f165bb8b75 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index a1d9b5a2f4..a1d9b5a2f4 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index ab4c07d059..ab4c07d059 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0f00c7e480..0f00c7e480 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
index a7d30bf201..a7d30bf201 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 7c358ac01c..7c358ac01c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index 38e90b41fa..38e90b41fa 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index 18ce21805c..18ce21805c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index e6b69e8cad..e6b69e8cad 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
index 8e18a56cca..8e18a56cca 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
index fdbbeeced2..fdbbeeced2 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
index 6b3f1f9890..6b3f1f9890 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
index 0b260b5dcf..0b260b5dcf 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 79f4041fe6..79f4041fe6 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 87353b69ea..87353b69ea 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index ebb693d243..ebb693d243 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 9f51277d22..9f51277d22 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
index 95dd9131eb..95dd9131eb 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index af1b3be0a5..af1b3be0a5 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
index f1ee21686d..f1ee21686d 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
index f2d684f766..f2d684f766 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/test.xml