diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:07:45 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:07:45 +0000 |
commit | 6a3ca6736c808c1647854e405ef379b609f276db (patch) | |
tree | 67670193d3511b227100419589d0f2ec0bb02cc0 /branches/sca-java-1.2.1/modules/implementation-spring/src | |
parent | 9f395ebf3ec27f89c8dc63137bc99c8d6b0cff6d (diff) |
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml (renamed from branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml) | 0 |
57 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java index b550fc3229..b550fc3229 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java index 2d298b1dd8..2d298b1dd8 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java index d1be4b4c18..d1be4b4c18 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java index 45f00ce1af..45f00ce1af 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java index dc532ce20d..dc532ce20d 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java index 1dd44cd752..1dd44cd752 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java index 9dadcd2f49..9dadcd2f49 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java index fe855e0c21..fe855e0c21 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java index 56af997fae..56af997fae 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java index 33f3793920..33f3793920 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java index d7724f1723..d7724f1723 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java index ff6070fd19..ff6070fd19 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java index 45c26f5f42..45c26f5f42 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java index bfbdb04f5b..bfbdb04f5b 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java index 5d677b6c26..5d677b6c26 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java index 3f98180498..3f98180498 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java index b39c5d674e..b39c5d674e 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java index ae191d6b45..ae191d6b45 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java index ceee459e3e..ceee459e3e 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java index b3f0b8bbf9..b3f0b8bbf9 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java index 9e55f30b46..9e55f30b46 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java index 85b29e5684..85b29e5684 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java index 346299c580..346299c580 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 4b71cef6c4..4b71cef6c4 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory index ab707cfd68..ab707cfd68 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers index db4158521d..db4158521d 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas index b701b49c4e..b701b49c4e 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd index e20f4e8158..e20f4e8158 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java index 6640b990ca..6640b990ca 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java index 5d5344cd13..5d5344cd13 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java index 0b7d2525cf..0b7d2525cf 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java index 249067ab2d..249067ab2d 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java index 43bb685e32..43bb685e32 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java index 94f7e83f30..94f7e83f30 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java index 9603b50704..9603b50704 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java index 83a6898502..83a6898502 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java index 4aaac6fa6a..4aaac6fa6a 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java index 1a93b1a8f9..1a93b1a8f9 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java index 76926c44c9..76926c44c9 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java index 1d91dc341e..1d91dc341e 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java index f3e45d766f..f3e45d766f 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java index 3fd7e72be4..3fd7e72be4 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java index 48a5971711..48a5971711 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java index 0ad7b01e9d..0ad7b01e9d 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml index 0733f49de8..0733f49de8 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml index c7feddf87f..c7feddf87f 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml index d59205e066..d59205e066 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml index f366c6819f..f366c6819f 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml index a181446ffb..a181446ffb 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml index aef5a5524b..aef5a5524b 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml index fb9fb03692..fb9fb03692 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite index 79f4041fe6..79f4041fe6 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite index 87353b69ea..87353b69ea 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite index ebb693d243..ebb693d243 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite index 9f51277d22..9f51277d22 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite index b811122b41..b811122b41 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml index 477ca69a38..477ca69a38 100644 --- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml |