192 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.2/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/README
index f3fe0450b5..f3fe0450b5 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/README
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/build.xml
index db823c786d..db823c786d 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/cloud.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/domain.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/pom.xml
index b6d1ec99a3..b6d1ec99a3 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 1a4860d52d..1a4860d52d 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index f9bdde79e1..f9bdde79e1 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 74849fe50b..74849fe50b 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 1f0fc9227a..1f0fc9227a 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-java-1.2/samples/calculator-distributed/workspace.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/branches/sca-java-1.2/samples/calculator-distributed/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/README
index b69c6873a6..b69c6873a6 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/README
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/build.xml
index 3d65356a06..3d65356a06 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/pom.xml
index b0ab0e6b26..b0ab0e6b26 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 57bbc39d89..57bbc39d89 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index c3adb904b2..c3adb904b2 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index b9f0feb145..b9f0feb145 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index d44e86775b..d44e86775b 100644
--- a/branches/sca-java-1.2/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/build.xml
index 5f491a0da9..5f491a0da9 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/pom.xml
index f9877ee079..f9877ee079 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index 3e0577341c..3e0577341c 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 5ca8b6ec99..5ca8b6ec99 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index d40614ad19..d40614ad19 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 2f5a050583..2f5a050583 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/pom.xml
index 1f8f2958c4..1f8f2958c4 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index 4e42d2046d..4e42d2046d 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 1b4db529c3..1b4db529c3 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index d40614ad19..d40614ad19 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 34d90ab451..34d90ab451 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-1.2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 3582eada70..3582eada70 100644
--- a/branches/sca-java-1.2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-1.2/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/README
diff --git a/branches/sca-java-1.2/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-1.2/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/build.xml
diff --git a/branches/sca-java-1.2/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-1.2/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-1.2/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-1.2/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-1.2/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/pom.xml
index e61727555e..e61727555e 100644
--- a/branches/sca-java-1.2/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index d31c020de0..d31c020de0 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.2/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-java-1.2/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/README
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/pom.xml
index 53d9749439..53d9749439 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
index 6c642e932c..6c642e932c 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/README
index 690152ff65..690152ff65 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/pom.xml
index fcf9d40bcd..fcf9d40bcd 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index 1550799832..1550799832 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index 7e9a8c2909..7e9a8c2909 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index 34457699e2..34457699e2 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 72fb6a50a9..72fb6a50a9 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 2b3ecad284..2b3ecad284 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 858e87a34f..858e87a34f 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 136f85fe00..136f85fe00 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index 20d7b3a136..20d7b3a136 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index eece3bc8f7..eece3bc8f7 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/README
index 690152ff65..690152ff65 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/README
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/pom.xml
index c3323ec525..c3323ec525 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index 1550799832..1550799832 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index ece31fd459..ece31fd459 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 8ec7426bd7..8ec7426bd7 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2/samples/calculator/README b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-1.2/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/README
diff --git a/branches/sca-java-1.2/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-1.2/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/build.xml
diff --git a/branches/sca-java-1.2/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.2/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/calculator.png
diff --git a/branches/sca-java-1.2/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-1.2/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/calculator.svg
diff --git a/branches/sca-java-1.2/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/pom.xml
index fdb0c617f8..fdb0c617f8 100644
--- a/branches/sca-java-1.2/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/pom.xml
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.2/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 775ad15537..775ad15537 100644
--- a/branches/sca-java-1.2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2/samples/calculator/src/test/java/calculator/CalculatorTestCase.java