Moving 1.x branches

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

245 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/README
index 66c4cddb94..66c4cddb94 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/pom.xml
index 8f34402396..8f34402396 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
index 168240fa01..168240fa01 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
index 717add91a8..717add91a8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
index 041608273b..041608273b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
index 65e9b89ce2..65e9b89ce2 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
index 83a1a5e23c..83a1a5e23c 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
index ea9386dfef..ea9386dfef 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
index c327e447e0..c327e447e0 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
index 55ffeac8a3..55ffeac8a3 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/README
index 87863752cd..87863752cd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml
index 36f202b820..36f202b820 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
index 1ab6cecef7..1ab6cecef7 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
index 4248ca8573..4248ca8573 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
index 97deba8ad0..97deba8ad0 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
index 3940e80c7b..3940e80c7b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
index ba67857ef2..ba67857ef2 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
index 25e1f2bc1a..25e1f2bc1a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
index c78a5ea161..c78a5ea161 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
index 5848bbaa2c..5848bbaa2c 100644
--- a/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/README
index 51f4b07e81..51f4b07e81 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/build.xml
index 233df53bdc..233df53bdc 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/cloud.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/domain.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/pom.xml
index f11266dc14..f11266dc14 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 3ff6c8969a..3ff6c8969a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index 50600eaedc..50600eaedc 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 95d8934665..95d8934665 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index 8b4fe566a1..8b4fe566a1 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 6bd74b32d1..6bd74b32d1 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index d42788aae4..d42788aae4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index c6983b0f9f..c6983b0f9f 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 2a6f3af002..2a6f3af002 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-distributed/workspace.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-distributed/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/README
index bd66eee1c9..bd66eee1c9 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/build.xml
index 4a87474657..4a87474657 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/pom.xml
index bec9a6c1e5..bec9a6c1e5 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 2bce187049..2bce187049 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index 6cccde0d13..6cccde0d13 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index 157570c3df..157570c3df 100644
--- a/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/README
index a8aff232c6..a8aff232c6 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/calculator.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/calculator.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/calculator.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/calculator.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/pom.xml
index da1e5bcb4d..da1e5bcb4d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
index 2bb8f96dcf..2bb8f96dcf 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/CalculatorTest.composite
index 906e2a3918..906e2a3918 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index a007a28f21..a007a28f21 100644
--- a/branches/sca-java-1.5.1/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/build.xml
index ca75625b42..ca75625b42 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/pom.xml
index 4063518677..4063518677 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..15e00f5946 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/pom.xml
index eea24ef7c1..eea24ef7c1 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 34d90ab451..34d90ab451 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 8943dd24f6..8943dd24f6 100644
--- a/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/build.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/pom.xml
index f2ef16757e..f2ef16757e 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.5.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-java-1.5.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/pom.xml
index 136ba08995..136ba08995 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 8b60ae590c..8b60ae590c 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 3ec5153b8e..3ec5153b8e 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4bc5c984dd..4bc5c984dd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/README
index d0d3307b3a..d0d3307b3a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/pom.xml
index 0180799321..0180799321 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index 46ec182124..46ec182124 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index c8653806aa..c8653806aa 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 9625c0d692..9625c0d692 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 23a62680c5..23a62680c5 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/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.5.1/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.5.1/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.5.1/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.5.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 4611669bbd..4611669bbd 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index 8ef9928018..8ef9928018 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 8b60ae590c..8b60ae590c 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 8ec6691639..8ec6691639 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/README
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/pom.xml
index 341ac6c4d0..341ac6c4d0 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index a7049729f7..a7049729f7 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 8b60ae590c..8b60ae590c 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 8ec6691639..8ec6691639 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.5.1/samples/calculator/README b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-1.5.1/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/README
diff --git a/branches/sca-java-1.5.1/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-1.5.1/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/build.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.5.1/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/calculator.png
diff --git a/branches/sca-java-1.5.1/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-1.5.1/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/calculator.svg
diff --git a/branches/sca-java-1.5.1/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/pom.xml
index c62315a1d0..c62315a1d0 100644
--- a/branches/sca-java-1.5.1/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/pom.xml
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 3b2966e96d..3b2966e96d 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 1b7476534a..1b7476534a 100644
--- a/branches/sca-java-1.5.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java