diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:40 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:40 +0000 |
commit | f9be2165328dc76f562938566057e89c0723fe08 (patch) | |
tree | 4b32774b0050ed2d0aeb05f9f22844d41cf13023 /branches/sca-java-2.0-M4/itest/implementation-spring/src | |
parent | a7c1a39d8c3c4ef4d5878dbff726085082a17e8a (diff) |
Moving 2.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar) | bin | 1454 -> 1454 bytes | |||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java (renamed from branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java (renamed from branches/sca-java-2.0-M4/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-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java index bd7770ca7d..bd7770ca7d 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java index 747433a9e7..747433a9e7 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java index 188451ebac..188451ebac 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java index eae607a7ca..eae607a7ca 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java index ce1cdaae5a..ce1cdaae5a 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java index b033516c1b..b033516c1b 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java index 30d248208b..30d248208b 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java index 1323edf55a..1323edf55a 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java index 5290605938..5290605938 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java index 91b803bc9e..91b803bc9e 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java index bf0d1882b6..bf0d1882b6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java index 58cc4a3547..58cc4a3547 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java index 4f063993a3..4f063993a3 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java index b3ef6e7312..b3ef6e7312 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java index 595626e672..595626e672 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java index fed509df98..fed509df98 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java index 8bb3006d12..8bb3006d12 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java index f68134702b..f68134702b 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java index 78b3649b5b..78b3649b5b 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java index 1a0abd7f8f..1a0abd7f8f 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java index e3d9a36bb8..e3d9a36bb8 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java index 47342fded8..47342fded8 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java index 6f5b280f31..6f5b280f31 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java index dea7933e1a..dea7933e1a 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java index b80b05dc08..b80b05dc08 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java index ecb085858d..ecb085858d 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml index 81d59432b8..81d59432b8 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite index abdaa98bff..abdaa98bff 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite index dd186bddfc..dd186bddfc 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml index c50f0ef4d9..c50f0ef4d9 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml index a0bb10e8dd..a0bb10e8dd 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite index 1c4b81db33..1c4b81db33 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF index 9267f28e83..9267f28e83 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml index 62e4e077b6..62e4e077b6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml index 5b1885d6b3..5b1885d6b3 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml index dcc88f6770..dcc88f6770 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config index 0e7cb86633..0e7cb86633 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties index 0238f0b013..0238f0b013 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite index 1000e616a7..1000e616a7 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml index c50f0ef4d9..c50f0ef4d9 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml index 278c94a18e..278c94a18e 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite index 2731fc455f..2731fc455f 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF index 950dbeba4c..950dbeba4c 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml index 8613e6c82a..8613e6c82a 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite index e8357cc62e..e8357cc62e 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar Binary files differindex 504d59e5ff..504d59e5ff 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml index 9912624870..9912624870 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml index 62e4e077b6..62e4e077b6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite index b8389be7f6..b8389be7f6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite index 8d1a655c4e..8d1a655c4e 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml index 1705164104..1705164104 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml index 539dfa6e32..539dfa6e32 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite index 294b211431..294b211431 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite index c77ab00323..c77ab00323 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml index 42e0cdbd23..42e0cdbd23 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml index 83558e8abc..83558e8abc 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite index b7c45b289f..b7c45b289f 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite index e1ccbcf3c6..e1ccbcf3c6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite index 236e2b23e6..236e2b23e6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml index 4a873f2424..4a873f2424 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java index 4503294f10..4503294f10 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java index 2602839d1d..2602839d1d 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java index 254b8100e1..254b8100e1 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java index 8df60c5bab..8df60c5bab 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java index f5261c85bb..f5261c85bb 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java index 9ff1b74567..9ff1b74567 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java index 8b12dd7af7..8b12dd7af7 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java index a44ae38d24..a44ae38d24 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java index d54f0544d8..d54f0544d8 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java index 71768f5a7b..71768f5a7b 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java index 0c6f8d2e84..0c6f8d2e84 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java index 73b151bf7a..73b151bf7a 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java index 5869d344f6..5869d344f6 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java index 90d26dd89f..90d26dd89f 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java index f28dace31a..f28dace31a 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java index def30b3ea0..def30b3ea0 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java index fa7967c964..fa7967c964 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java index b57cc7f366..b57cc7f366 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java index 0c2e1daa81..0c2e1daa81 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java index 8d0c548899..8d0c548899 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java index f4bd53876c..f4bd53876c 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java index 0907985d7f..0907985d7f 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java index 13b84c8c73..13b84c8c73 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java diff --git a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java index 5db9c84c00..5db9c84c00 100644 --- a/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java |