summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar)bin1454 -> 1454 bytes
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java (renamed from branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java)0
84 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 833cc50f71..833cc50f71 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index d6db2bd182..d6db2bd182 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
index a597691905..a597691905 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
index 4363650e52..4363650e52 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
index 09024197db..09024197db 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 77d98d50aa..77d98d50aa 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index 830052ae19..830052ae19 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
index 73939693a4..73939693a4 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 0e2374d599..0e2374d599 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java
index 96df81fc0c..96df81fc0c 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
index 538d3547f4..538d3547f4 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
index 5c9dede7ec..5c9dede7ec 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java
index 0a8742d242..0a8742d242 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
index 27ccdbdd77..27ccdbdd77 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
index 881ca8bb7d..881ca8bb7d 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 000b135f01..000b135f01 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 910771b34d..910771b34d 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
index 3faed92fd2..3faed92fd2 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
index 74473073ea..74473073ea 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
index 930b92f4be..930b92f4be 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
index 8613e6c82a..8613e6c82a 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
index 504d59e5ff..504d59e5ff 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
Binary files differ
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
index d18d8312e3..d18d8312e3 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
index df4b9b28cf..df4b9b28cf 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
index 194bc4bcc9..194bc4bcc9 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
index 1c63311367..1c63311367 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
index 8863553419..8863553419 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
index 2d6705ce56..2d6705ce56 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 15c0c39f51..15c0c39f51 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 28b62dfeb9..28b62dfeb9 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
index 94e4997734..94e4997734 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index d33ae8ca4b..d33ae8ca4b 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index e47b6526ff..e47b6526ff 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 9099abdbeb..9099abdbeb 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 42c67ffa39..42c67ffa39 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index 4aa9b7a56d..4aa9b7a56d 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index ae972f8647..ae972f8647 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index b259b9d657..b259b9d657 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index 8ab04edc63..8ab04edc63 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
index 21f89e6a1c..21f89e6a1c 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index 828e94ff65..828e94ff65 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
index 5feb293bc8..5feb293bc8 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index e9bfaa0a1d..e9bfaa0a1d 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
index 3940bf65fa..3940bf65fa 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
index 75b296bf32..75b296bf32 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index d8ecae99bd..d8ecae99bd 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 3f26b8c6db..3f26b8c6db 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index efd5fd22df..efd5fd22df 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index 88ac2e8cb5..88ac2e8cb5 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index e3600a355c..e3600a355c 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index f93095e3c9..f93095e3c9 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 605a0079fb..605a0079fb 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index e712593fe3..e712593fe3 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index f75df2c75d..f75df2c75d 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 32cb26979e..32cb26979e 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index f8f8886f9f..f8f8886f9f 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index d9522e12a0..d9522e12a0 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index 1ad1779ee2..1ad1779ee2 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 9bc12c3e7b..9bc12c3e7b 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 52ea64a3ed..52ea64a3ed 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index 35f44b2af7..35f44b2af7 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 488bdcb202..488bdcb202 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index 5a5056d91e..5a5056d91e 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 3a9ec4bbb2..3a9ec4bbb2 100644
--- a/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java