Moving 1.x branches

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

289 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-0.91/samples/README b/sca-java-1.x/branches/sca-java-0.91/samples/README
index eac75adbce..eac75adbce 100644
--- a/branches/sca-java-0.91/samples/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/README
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/README b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/README
index d8ded49e21..d8ded49e21 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/README
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/build.xml
index 17defccb6d..17defccb6d 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/pom.xml
index 18c3105820..18c3105820 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/DefaultEchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/DefaultEchoBindingFactory.java
index b27b936302..b27b936302 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/DefaultEchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/DefaultEchoBindingFactory.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 446f720634..446f720634 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index ef1629d519..ef1629d519 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 1d82cd860c..1d82cd860c 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/module/EchoModuleActivator.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/module/EchoModuleActivator.java
index 268b903e54..268b903e54 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/module/EchoModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/module/EchoModuleActivator.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index e3d52fa703..e3d52fa703 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index 623cb0e16e..623cb0e16e 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index dd1a8f42f8..dd1a8f42f8 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 896e40df8d..896e40df8d 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index e1c88c38f9..e1c88c38f9 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoService.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoService.java
index 79593b2b6c..79593b2b6c 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/java/echo/server/EchoService.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 13d0d6f570..13d0d6f570 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index dc6a37c11f..dc6a37c11f 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index fafc112d01..fafc112d01 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index d0d138533b..d0d138533b 100644
--- a/branches/sca-java-0.91/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.91/samples/binding-echo/README b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/README
index 0aea36a081..0aea36a081 100644
--- a/branches/sca-java-0.91/samples/binding-echo/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/README
diff --git a/branches/sca-java-0.91/samples/binding-echo/binding-echo.png b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-java-0.91/samples/binding-echo/binding-echo.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-java-0.91/samples/binding-echo/binding-echo.svg b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-java-0.91/samples/binding-echo/binding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-java-0.91/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-java-0.91/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/build.xml
diff --git a/branches/sca-java-0.91/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/pom.xml
index 3c95cabc61..3c95cabc61 100644
--- a/branches/sca-java-0.91/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/pom.xml
diff --git a/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 97ed202177..97ed202177 100644
--- a/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-0.91/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-java-0.91/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.91/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 9851379207..9851379207 100644
--- a/branches/sca-java-0.91/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/build.xml
index 30817fe6f0..30817fe6f0 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/pom.xml
index 93238ff98b..93238ff98b 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 08cba76467..08cba76467 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index 20dce0ec28..20dce0ec28 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 0bddb0445f..0bddb0445f 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/pom.xml
index b8b51b7f9a..b8b51b7f9a 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 978d2c6f42..978d2c6f42 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 85e2dc4135..85e2dc4135 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-0.91/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 67300bd99e..67300bd99e 100644
--- a/branches/sca-java-0.91/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-0.91/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/README
diff --git a/branches/sca-java-0.91/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-0.91/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/build.xml
diff --git a/branches/sca-java-0.91/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-0.91/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-0.91/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-0.91/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-0.91/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/pom.xml
index 76a63dc866..76a63dc866 100644
--- a/branches/sca-java-0.91/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/Calculator.composite
index fce26f940f..fce26f940f 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-0.91/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index c174cf7ed9..c174cf7ed9 100644
--- a/branches/sca-java-0.91/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/README
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/build.xml
index 32156e322e..32156e322e 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/build.xml
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/pom.xml
index 799a12fec3..799a12fec3 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/resources/Calculator.composite
index 785984fd55..785984fd55 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 048c4c125c..048c4c125c 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index dfed3b33e7..dfed3b33e7 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/calc.jsp
index 375116e5de..375116e5de 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-0.91/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 65b8646d4d..65b8646d4d 100644
--- a/branches/sca-java-0.91/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.91/samples/calculator/README b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-0.91/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/README
diff --git a/branches/sca-java-0.91/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-0.91/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/build.xml
diff --git a/branches/sca-java-0.91/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-0.91/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/calculator.png
diff --git a/branches/sca-java-0.91/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-0.91/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/calculator.svg
diff --git a/branches/sca-java-0.91/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/pom.xml
index cb29bd1c1a..cb29bd1c1a 100644
--- a/branches/sca-java-0.91/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/pom.xml
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/resources/Calculator.composite
index f8655c04fa..f8655c04fa 100644
--- a/branches/sca-java-0.91/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.91/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 8da7097149..8da7097149 100644
--- a/branches/sca-java-0.91/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.91/samples/chat-webapp/README b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/README
index c52f12e3d4..c52f12e3d4 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/README
diff --git a/branches/sca-java-0.91/samples/chat-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/pom.xml
index 6eb983a998..6eb983a998 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/pom.xml
diff --git a/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatService.java
index 1fb9d292cd..1fb9d292cd 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index 7d0bfb3307..7d0bfb3307 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/resources/chat.composite
index 3ee7716899..3ee7716899 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/src/main/resources/chat.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b897ddef76..b897ddef76 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 998d54bae5..998d54bae5 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/chat.html
index ff3d71eb90..ff3d71eb90 100644
--- a/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/chat.html
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/branches/sca-java-0.91/samples/databinding-echo/README b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/README
diff --git a/branches/sca-java-0.91/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/build.xml
index 22fc41228b..22fc41228b 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/build.xml
diff --git a/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-java-0.91/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/pom.xml
index 2fe62347a6..2fe62347a6 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/pom.xml
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index a0b39ad460..a0b39ad460 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 2f042b8e34..2f042b8e34 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 13d0d6f570..13d0d6f570 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-java-0.91/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-java-0.91/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-java-0.91/samples/feed-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/pom.xml
index 1f8982d3ee..1f8982d3ee 100644
--- a/branches/sca-java-0.91/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 6bb418067a..6bb418067a 100644
--- a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SampleServer.java
index 5e57487809..5e57487809 100644
--- a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SampleServer.java
diff --git a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/Sort.java
index d08f2dcb72..d08f2dcb72 100644
--- a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index d9987a0ff7..d9987a0ff7 100644
--- a/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-0.91/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index f2a69eca43..f2a69eca43 100644
--- a/branches/sca-java-0.91/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/README b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/README
index cc25b50192..cc25b50192 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/README
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/build-dojo.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/build-dojo.xml
index 335a10817a..335a10817a 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/build-dojo.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/build.xml
index 839679b909..839679b909 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/build.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.png
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.svg
index 5c5cb91157..5c5cb91157 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/pom.xml
index 537cfd57b9..537cfd57b9 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/pom.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
index 6ceef2041f..6ceef2041f 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
index b6c8f868d3..b6c8f868d3 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
index 1cc4ac12af..1cc4ac12af 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
index 61b1057974..61b1057974 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-dojo/src/main/webapp/style.css
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/README b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/README
index 93a2c703ac..93a2c703ac 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/README
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml
index 579af28c56..579af28c56 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/build.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
index fe966d8c17..fe966d8c17 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/pom.xml
index 476406bd91..476406bd91 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/pom.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
index 6ceef2041f..6ceef2041f 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
index 98853189db..98853189db 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
index be750ec461..be750ec461 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
index 61b1057974..61b1057974 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-jsonrpc/src/main/webapp/style.css
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/README b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/README
index 8ee8dd7ff5..8ee8dd7ff5 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/README
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/pom.xml
index 8700c32c37..8700c32c37 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index 433a98fd7f..433a98fd7f 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 1f1310cbe9..1f1310cbe9 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 1e468bc9ca..1e468bc9ca 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index c4b7d03246..c4b7d03246 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java
index 40caf1de4d..40caf1de4d 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/README b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/README
index b82d5bd329..b82d5bd329 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/README
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.svg
index 3305faeed8..3305faeed8 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/pom.xml
index ad2f1f168c..ad2f1f168c 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index bd527ff8e2..bd527ff8e2 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
index 76ccf71fb8..76ccf71fb8 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.91/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 449979d4c1..449979d4c1 100644
--- a/branches/sca-java-0.91/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/README b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/README
diff --git a/branches/sca-java-0.91/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/build.xml
diff --git a/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-java-0.91/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/pom.xml
index 422e0d282b..422e0d282b 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/pom.xml
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index 71859a321e..71859a321e 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-0.91/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index d20f6d17d3..d20f6d17d3 100644
--- a/branches/sca-java-0.91/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/README b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/README
index 973c13d00c..973c13d00c 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/README
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/pom.xml
index d14500a621..d14500a621 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 5cb2bd2b1c..5cb2bd2b1c 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index 2a6f3bd955..2a6f3bd955 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java
index 38aac604d9..38aac604d9 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 4dd3e336b7..4dd3e336b7 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java
index cf57336cd1..cf57336cd1 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java
index bd6a037ba7..bd6a037ba7 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 0f040a478f..0f040a478f 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 08e041d7e0..08e041d7e0 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java
index f09922e965..f09922e965 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d9ab99f258..d9ab99f258 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 8b092818a9..8b092818a9 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-java-0.91/samples/implementation-crud/README b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/README
diff --git a/branches/sca-java-0.91/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/build.xml
diff --git a/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-java-0.91/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/pom.xml
index 66f005f796..66f005f796 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/pom.xml
diff --git a/branches/sca-java-0.91/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ff2da8985b..ff2da8985b 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-java-0.91/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-java-0.91/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index c3fe9d0f62..c3fe9d0f62 100644
--- a/branches/sca-java-0.91/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-java-0.91/samples/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/pom.xml
index 037f8c4696..037f8c4696 100644
--- a/branches/sca-java-0.91/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/pom.xml
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/README
index 92e4a379ac..92e4a379ac 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/README
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/build.xml
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/pom.xml
index 99e8617699..99e8617699 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 3f207e2f79..3f207e2f79 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 0d73a6c3c9..0d73a6c3c9 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index c8fc6277ca..c8fc6277ca 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 03df61772b..03df61772b 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/resources/BigBank.composite
index ebebce5af9..ebebce5af9 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-0.91/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index 42d780953d..42d780953d 100644
--- a/branches/sca-java-0.91/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/README b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-java-0.91/samples/simple-callback/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/README
diff --git a/branches/sca-java-0.91/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-java-0.91/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/build.xml
diff --git a/branches/sca-java-0.91/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/pom.xml
index be9071a5cb..be9071a5cb 100644
--- a/branches/sca-java-0.91/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/pom.xml
diff --git a/branches/sca-java-0.91/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-0.91/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-java-0.91/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-java-0.91/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-0.91/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cafa1bf2fb..cafa1bf2fb 100644
--- a/branches/sca-java-0.91/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-0.91/samples/supplychain/README b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/README
index b376a172bd..b376a172bd 100644
--- a/branches/sca-java-0.91/samples/supplychain/README
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/README
diff --git a/branches/sca-java-0.91/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-java-0.91/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/build.xml
diff --git a/branches/sca-java-0.91/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/pom.xml
index 46c044709b..46c044709b 100644
--- a/branches/sca-java-0.91/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/pom.xml
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-0.91/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-0.91/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index d7421e9889..d7421e9889 100644
--- a/branches/sca-java-0.91/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-0.91/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-java-0.91/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/supplychain.png
diff --git a/branches/sca-java-0.91/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-java-0.91/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-0.91/samples/supplychain/supplychain.svg