Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835145 13f79535-47bb-0310-9956-ffa450edef68

59 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 81c47a78d1..81c47a78d1 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index d4b3fe9035..d4b3fe9035 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java
index a597691905..a597691905 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
index 4363650e52..4363650e52 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java
index 09024197db..09024197db 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 77d98d50aa..77d98d50aa 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
index 46f8facf78..46f8facf78 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
index 73939693a4..73939693a4 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
index 4d4b5a2931..4d4b5a2931 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBean.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBean.java
index 96df81fc0c..96df81fc0c 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBean.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBean.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java
index 538d3547f4..538d3547f4 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java
index 5c9dede7ec..5c9dede7ec 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReference.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReference.java
index 0a8742d242..0a8742d242 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReference.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReference.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java
index 27ccdbdd77..27ccdbdd77 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
index 881ca8bb7d..881ca8bb7d 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 0206849a53..0206849a53 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite
index 4704239620..4704239620 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite
index 6662531971..6662531971 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index 4532810433..4532810433 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index f99eacf9d5..f99eacf9d5 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
index 0b8ee44e85..0b8ee44e85 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
index f547b179ef..f547b179ef 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite
index eb40f30b3c..eb40f30b3c 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite
index 98cd9ec225..98cd9ec225 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml
index 992c1b92f5..992c1b92f5 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
index c6f2111d0e..c6f2111d0e 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
index d2f406294d..d2f406294d 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
index 7b16c221cf..7b16c221cf 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar
index d8ee59a610..d8ee59a610 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
index 932ebb1361..932ebb1361 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 7d72242df3..7d72242df3 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 847056adf6..847056adf6 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
index d18d8312e3..d18d8312e3 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
index df4b9b28cf..df4b9b28cf 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
index 25adcc183e..25adcc183e 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
index 31429e5f63..31429e5f63 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
index 194bc4bcc9..194bc4bcc9 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
index 1c63311367..1c63311367 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
index 6958c28361..6958c28361 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
index 3969eef213..3969eef213 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite
index 2c0de830ab..2c0de830ab 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml