diff options
Diffstat (limited to '')
| -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) | bin | 1454 -> 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 |
34 files changed, 0 insertions, 0 deletions
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 Binary files differindex 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 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 |