Moving 1.x branches

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

157 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.1/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/README
index d0629903de..d0629903de 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/README
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/build.xml
index 59f704f4a2..59f704f4a2 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/pom.xml
index b1f6b14ca9..b1f6b14ca9 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
index 5dd64fc920..5dd64fc920 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java
index a900cb72f8..a900cb72f8 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 6c0ffe4ac0..6c0ffe4ac0 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
index 8dc6ffb2bd..8dc6ffb2bd 100644
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/README
index 1c974dd43c..1c974dd43c 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/README
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/build.xml
index 7afa23a07f..7afa23a07f 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/pom.xml
index cf7e3ba46c..cf7e3ba46c 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index c1f79888cb..c1f79888cb 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index a9461f65de..a9461f65de 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index f6ed3573b3..f6ed3573b3 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index 7dcbc1ff84..7dcbc1ff84 100644
--- a/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/build.xml
index ca75625b42..ca75625b42 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/pom.xml
index 3454239385..3454239385 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..15e00f5946 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/pom.xml
index 7755f7d8d5..7755f7d8d5 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 34d90ab451..34d90ab451 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-1.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 8943dd24f6..8943dd24f6 100644
--- a/branches/sca-java-1.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-1.1/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/README
diff --git a/branches/sca-java-1.1/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-1.1/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/build.xml
diff --git a/branches/sca-java-1.1/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-1.1/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-1.1/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-1.1/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-1.1/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/pom.xml
index 9f91ca80ab..9f91ca80ab 100644
--- a/branches/sca-java-1.1/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-java-1.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/README
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/pom.xml
index 41620f0a4a..41620f0a4a 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
index 6c642e932c..6c642e932c 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/README
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml
index 4183e57698..4183e57698 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index a7049729f7..a7049729f7 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index ce1391529b..ce1391529b 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.1/samples/calculator/README b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-1.1/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/README
diff --git a/branches/sca-java-1.1/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-1.1/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/build.xml
diff --git a/branches/sca-java-1.1/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.1/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/calculator.png
diff --git a/branches/sca-java-1.1/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-1.1/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/calculator.svg
diff --git a/branches/sca-java-1.1/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/pom.xml
index 0f3dbfeadd..0f3dbfeadd 100644
--- a/branches/sca-java-1.1/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/pom.xml
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.1/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 775ad15537..775ad15537 100644
--- a/branches/sca-java-1.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java