summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.4/itest/spring
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:08:29 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:08:29 +0000
commit725006d4c47e63986ac042ade23a4d193298b1fe (patch)
treeecb2465ddee739a48032ac5c7fa0311e4d90f309 /sca-java-1.x/branches/sca-java-1.4/itest/spring
parent61c9466ff91ca40f4b1ebbe670d7848e521131d7 (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835131 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/pom.xml (renamed from branches/sca-java-1.4/itest/spring/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddService.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideService.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractService.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/JaasLoginModule.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/JaasLoginModule.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/UserPrincipal.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/UserPrincipal.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java (renamed from branches/sca-java-1.4/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/CalculatorService-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/CalculatorService-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/access/Calculator.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/context/access/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/imports/Calculator.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/context/imports/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/multiple/StockQuote.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/context/multiple/StockQuote.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/Calculator.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/definitions.xml (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/spring/annotations/Calculator.composite (renamed from branches/sca-java-1.4/itest/spring/src/main/resources/spring/annotations/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/access/CalculatorClient.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/context/access/CalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/access/ContextAccessTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/context/access/ContextAccessTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/CalculatorClient.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/context/imports/CalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/StockQuoteServer.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/StockQuoteServer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/CalculatorClient.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/CalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/CalculatorClient.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/CalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java (renamed from branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java)0
56 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.4/itest/spring/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/pom.xml
index b16c777cfc..b16c777cfc 100644
--- a/branches/sca-java-1.4/itest/spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/pom.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 81c47a78d1..81c47a78d1 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index d4b3fe9035..d4b3fe9035 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddServiceImpl.java
index a597691905..a597691905 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
index 4363650e52..4363650e52 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/UserPrincipal.java
index 09024197db..09024197db 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 77d98d50aa..77d98d50aa 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 0206849a53..0206849a53 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/CalculatorService-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 18ab7e332d..18ab7e332d 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
index 3faed92fd2..3faed92fd2 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
index 74473073ea..74473073ea 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
index fb4be314b6..fb4be314b6 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/context/access/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/access/Calculator.composite
index 03116905fc..03116905fc 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/context/access/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/access/Calculator.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/context/imports/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/imports/Calculator.composite
index 709de34a34..709de34a34 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/context/imports/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/imports/Calculator.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/multiple/StockQuote.composite
index 3838515055..3838515055 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/context/multiple/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/context/multiple/StockQuote.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/Calculator.composite
index 0551dc60ef..0551dc60ef 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/Calculator.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/definitions.xml
index 992c1b92f5..992c1b92f5 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 70b2d5fdab..70b2d5fdab 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index bab9ecb528..bab9ecb528 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/spring/annotations/Calculator.composite
index a8a1f5b703..a8a1f5b703 100644
--- a/branches/sca-java-1.4/itest/spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/context/access/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/access/CalculatorClient.java
index 9b7202d951..9b7202d951 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/access/CalculatorClient.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
index 5feb293bc8..5feb293bc8 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/CalculatorClient.java
index d3bd190cc0..d3bd190cc0 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
index 3940bf65fa..3940bf65fa 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
index 75b296bf32..75b296bf32 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
index ca64d5fcb9..ca64d5fcb9 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
index 27e634d301..27e634d301 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index 1e759f98a0..1e759f98a0 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 634e3d34af..634e3d34af 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index aeb7918add..aeb7918add 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 3957e49bf3..3957e49bf3 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index d75d19295d..d75d19295d 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 4088691ccd..4088691ccd 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index 840bf59b73..840bf59b73 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
index c21561a962..c21561a962 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 3a9ec4bbb2..3a9ec4bbb2 100644
--- a/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java