summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/implementation-spring
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-13 01:42:27 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-13 01:42:27 +0000
commit3c7c4a749baafcf375f4785a7668d3a25c9063e3 (patch)
treea66b8b031c5dc6c7744f44b44b6bcd371bd0b8df /branches/sca-java-1.x/modules/implementation-spring
parenteb03ff672236cddf65533f39b83ddd5e2984a2bb (diff)
Moving 1.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/LICENSE (renamed from branches/sca-java-1.x/modules/implementation-spring-old/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/NOTICE (renamed from branches/sca-java-1.x/modules/implementation-spring-old/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/pom.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/spring.handlers (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/spring.handlers)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/spring.schemas (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/spring.schemas)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/impl-spring-validation-messages.properties (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/impl-spring-validation-messages.properties)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/org/springframework/sca/xml/spring-sca.xsd (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/org/springframework/sca/xml/spring-sca.xsd)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringContextAccess-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringContextAccess-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/testReferenceContext.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/testReferenceContext.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/testServiceContext.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/testServiceContext.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/spring/META-INF/MANIFEST.MF (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/spring/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/test.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/test.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/LICENSE (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/NOTICE (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/README (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/README)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/pom.xml (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd (renamed from branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/LICENSE (renamed from branches/sca-java-1.x/modules/implementation-spring/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/NOTICE (renamed from branches/sca-java-1.x/modules/implementation-spring/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/README (renamed from branches/sca-java-1.x/modules/implementation-spring/README)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/pom.xml (renamed from branches/sca-java-1.x/modules/implementation-spring/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties (renamed from branches/sca-java-1.x/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties)0
131 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/LICENSE b/sca-java-1.x/trunk/modules/implementation-spring-old/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/LICENSE
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/NOTICE b/sca-java-1.x/trunk/modules/implementation-spring-old/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/NOTICE
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/NOTICE
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/pom.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/pom.xml
index 6a81cb35bd..6a81cb35bd 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/pom.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/pom.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
index b550fc3229..b550fc3229 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
index 32f575fe46..32f575fe46 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
index d419d6db68..d419d6db68 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
index 45f00ce1af..45f00ce1af 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
index dc532ce20d..dc532ce20d 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
index 1dd44cd752..1dd44cd752 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
index 9dadcd2f49..9dadcd2f49 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index 35df76fabc..35df76fabc 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 6f22567070..6f22567070 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
index 546006e504..546006e504 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
index 88358732ed..88358732ed 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
index 9f46683bcb..9f46683bcb 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
index 410525a054..410525a054 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
index 3a183b7a4e..3a183b7a4e 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
index b34b1ee0b1..b34b1ee0b1 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
index 3f98180498..3f98180498 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
index cd0567f461..cd0567f461 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
index 4dadf37189..4dadf37189 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
index 44737bf9d1..44737bf9d1 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
index d8755c58f4..d8755c58f4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
index 52f8ac3684..52f8ac3684 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
index 92f980fdfe..92f980fdfe 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index 629a72e22d..629a72e22d 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index 5b6cfcab5b..5b6cfcab5b 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java
index fe632190ee..fe632190ee 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
index 553b3d33dd..553b3d33dd 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index c60fdb86a9..c60fdb86a9 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index 2f37ab6504..2f37ab6504 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index b3f45415fd..b3f45415fd 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 2eb5686270..2eb5686270 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index ef42e8c610..ef42e8c610 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4b71cef6c4..4b71cef6c4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ab707cfd68..ab707cfd68 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/spring.handlers
index 7f9a7b17b0..7f9a7b17b0 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/impl-spring-validation-messages.properties b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/impl-spring-validation-messages.properties
index 6fce02664a..6fce02664a 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/impl-spring-validation-messages.properties
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index 4f1d5ca730..4f1d5ca730 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index 6b2d114756..6b2d114756 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index c9b30b1688..c9b30b1688 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index fd295daaf6..fd295daaf6 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 65ab096855..65ab096855 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index bd35e9f3b9..bd35e9f3b9 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
index d77f183a66..d77f183a66 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 86f979fe15..86f979fe15 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 44016ad249..44016ad249 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 74dcf32723..74dcf32723 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 97f91ff91e..97f91ff91e 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
index bfe3d64cf3..bfe3d64cf3 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 2c46f8c066..2c46f8c066 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 4d60bffef8..4d60bffef8 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index acad9f2fea..acad9f2fea 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
index 79de2b32a0..79de2b32a0 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f165bb8b75..f165bb8b75 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index a1d9b5a2f4..a1d9b5a2f4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index ab4c07d059..ab4c07d059 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0f00c7e480..0f00c7e480 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
index a7d30bf201..a7d30bf201 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 7c358ac01c..7c358ac01c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index 38e90b41fa..38e90b41fa 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index e6b69e8cad..e6b69e8cad 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
index 8e18a56cca..8e18a56cca 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/testReferenceContext.xml
index fdbbeeced2..fdbbeeced2 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/testServiceContext.xml
index 6b3f1f9890..6b3f1f9890 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
index 0b260b5dcf..0b260b5dcf 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 79f4041fe6..79f4041fe6 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 87353b69ea..87353b69ea 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index ebb693d243..ebb693d243 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 9f51277d22..9f51277d22 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
index 95dd9131eb..95dd9131eb 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index af1b3be0a5..af1b3be0a5 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/spring/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/spring/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/spring/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/spring/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
index 6950f3e26a..6950f3e26a 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/test.xml b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/test.xml
index f2d684f766..f2d684f766 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-old/src/test/resources/test.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-old/src/test/resources/test.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/LICENSE b/sca-java-1.x/trunk/modules/implementation-spring-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/LICENSE
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/NOTICE b/sca-java-1.x/trunk/modules/implementation-spring-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/NOTICE
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/NOTICE
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/README b/sca-java-1.x/trunk/modules/implementation-spring-runtime/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/README
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/README
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/pom.xml b/sca-java-1.x/trunk/modules/implementation-spring-runtime/pom.xml
index df2c65008e..df2c65008e 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/pom.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/pom.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
index 52f0260d11..52f0260d11 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
index a3af64ed0d..a3af64ed0d 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
index ce17477fca..ce17477fca 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
index eca6f50f26..eca6f50f26 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
index 0e98277e78..0e98277e78 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
index 1197647b15..1197647b15 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
index 72db91327c..72db91327c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
index 9c1b7a0b3d..9c1b7a0b3d 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
index 0368f27caf..0368f27caf 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
index 5ddcf1ff51..5ddcf1ff51 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
index bc222e622c..bc222e622c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
index 79095f2217..79095f2217 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
index c1aaf1570f..c1aaf1570f 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
index b93874a9f3..b93874a9f3 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
index c579915970..c579915970 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
index b123be8b5c..b123be8b5c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
index 6d29e21024..6d29e21024 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index 3ac14e3e58..3ac14e3e58 100644
--- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-1.x/trunk/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.x/modules/implementation-spring/LICENSE b/sca-java-1.x/trunk/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/LICENSE
+++ b/sca-java-1.x/trunk/modules/implementation-spring/LICENSE
diff --git a/branches/sca-java-1.x/modules/implementation-spring/NOTICE b/sca-java-1.x/trunk/modules/implementation-spring/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/NOTICE
+++ b/sca-java-1.x/trunk/modules/implementation-spring/NOTICE
diff --git a/branches/sca-java-1.x/modules/implementation-spring/README b/sca-java-1.x/trunk/modules/implementation-spring/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/README
+++ b/sca-java-1.x/trunk/modules/implementation-spring/README
diff --git a/branches/sca-java-1.x/modules/implementation-spring/pom.xml b/sca-java-1.x/trunk/modules/implementation-spring/pom.xml
index 0853d4ff81..0853d4ff81 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/pom.xml
+++ b/sca-java-1.x/trunk/modules/implementation-spring/pom.xml
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
index 86902e5104..86902e5104 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
index b644a69c15..b644a69c15 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 61b707b1e1..61b707b1e1 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
index 339e753c04..339e753c04 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
index c6637d31c4..c6637d31c4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
index c666217777..c666217777 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
index 5b6206ef9b..5b6206ef9b 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
index 774bc051d3..774bc051d3 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
index c74d4abed9..c74d4abed9 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
index 732557e4ea..732557e4ea 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
index 3b73ba00c1..3b73ba00c1 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
index 2f245d7f06..2f245d7f06 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java
index 0464355565..0464355565 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java
index a0e7186eab..a0e7186eab 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
index 743abaa79b..743abaa79b 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
index 290bbff171..290bbff171 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
index 1fc01b2627..1fc01b2627 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
index 4796aa0de9..4796aa0de9 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
index 0a069c032f..0a069c032f 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
index d1330f8471..d1330f8471 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
index 3bf68a689c..3bf68a689c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
index 1d941e2a4f..1d941e2a4f 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 99e362fea4..99e362fea4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint
index efa3d5ed7c..efa3d5ed7c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 41e20e531f..41e20e531f 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
index 6fce02664a..6fce02664a 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-1.x/trunk/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties