90 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/README
index 7f76542622..7f76542622 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/README
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/build.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/build.xml
index 75c4839cfa..75c4839cfa 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/build.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.png b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.png
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.svg b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/calculator.svg
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml
index a6f14bcf13..a6f14bcf13 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index b49e1da130..b49e1da130 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/README
index 332526d43a..332526d43a 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/README
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/build.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/build.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml
index 50ca4eb267..50ca4eb267 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index 9d9b0a9ffb..9d9b0a9ffb 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/README
index 07b6dd9713..07b6dd9713 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/build.xml
index e95ad1610b..e95ad1610b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml
index d92dc3bceb..d92dc3bceb 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index e14cc3dd13..e14cc3dd13 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5510954e0..a5510954e0 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/README
index 144881134b..144881134b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/build.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/build.xml
index a0889ccc8a..a0889ccc8a 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml
index b7e786d3b8..b7e786d3b8 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b77015bcae..b77015bcae 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 02614ad6e1..02614ad6e1 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/README
index 56c22d9c89..56c22d9c89 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/README
diff --git a/branches/sca-java-2.0-M4/samples/calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/build.xml
index 4411cae659..4411cae659 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/build.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/build.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator/calculator.png b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/calculator.png
diff --git a/branches/sca-java-2.0-M4/samples/calculator/calculator.svg b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/calculator.svg
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/calculator.svg
diff --git a/branches/sca-java-2.0-M4/samples/calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/pom.xml
index d1bb41aab5..d1bb41aab5 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 03fc56ceb3..03fc56ceb3 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M4/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 73c7d872b9..73c7d872b9 100644
--- a/branches/sca-java-2.0-M4/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/calculator/src/test/java/calculator/CalculatorTestCase.java