330 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/2.0-M4-RC1/samples/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/README
index 4ccefa3695..4ccefa3695 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/README
index fb5afcc7ec..fb5afcc7ec 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/build.xml
index e13ec494b0..e13ec494b0 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/calculator.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/calculator.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/calculator.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/calculator.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/pom.xml
index 67cdee5815..67cdee5815 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
index 7e5ff160f0..7e5ff160f0 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
index 6620f6a5e7..6620f6a5e7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
index 000c108934..000c108934 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/Calculator.composite
index 29dd7e3b6f..29dd7e3b6f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index 8f6b5e4845..8f6b5e4845 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/build-common.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/build-common.xml
index 2354dd1ce4..2354dd1ce4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/build-common.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/build-common.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/README
index 7f76542622..7f76542622 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/build.xml
index 75c4839cfa..75c4839cfa 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/calculator.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/calculator.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/calculator.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/calculator.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/pom.xml
index 78c4f2c0e2..78c4f2c0e2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index b49e1da130..b49e1da130 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/README
index 332526d43a..332526d43a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/pom.xml
index 35a302e68b..35a302e68b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index 9d9b0a9ffb..9d9b0a9ffb 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/README
index 07b6dd9713..07b6dd9713 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/build.xml
index e95ad1610b..e95ad1610b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/pom.xml
index 01166487f9..01166487f9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index e14cc3dd13..e14cc3dd13 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5510954e0..a5510954e0 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/README
index 144881134b..144881134b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/build.xml
index a0889ccc8a..a0889ccc8a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/pom.xml
index f3f8ed5644..f3f8ed5644 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b77015bcae..b77015bcae 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 02614ad6e1..02614ad6e1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/README
index 56c22d9c89..56c22d9c89 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/build.xml
index 4411cae659..4411cae659 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/calculator.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/calculator.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/calculator.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/calculator.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/pom.xml
index 8c0a29be3b..8c0a29be3b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 03fc56ceb3..03fc56ceb3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/resources/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 73c7d872b9..73c7d872b9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/LICENSE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/NOTICE
index 51042eab05..51042eab05 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/NOTICE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index 72e2c339f1..72e2c339f1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index 253f7d0df1..253f7d0df1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/README
index 9e616c1f50..9e616c1f50 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/pom.xml
index 883eb22bbe..883eb22bbe 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index 16a33f4f65..16a33f4f65 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/LICENSE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/LICENSE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/NOTICE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/NOTICE
index 51042eab05..51042eab05 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/NOTICE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 769bcdd14d..769bcdd14d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index 481fd67e09..481fd67e09 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/README
index 374c0f0a8b..374c0f0a8b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/dosgi-calculator.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/pom.xml
index 9865570638..9865570638 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b14b3516f6..b14b3516f6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4dd713ecef..4dd713ecef 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/NOTICE
index 51042eab05..51042eab05 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index b00f05ad2d..b00f05ad2d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/README
index 9e616c1f50..9e616c1f50 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/pom.xml
index 71cd14113c..71cd14113c 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f75cc6444e..f75cc6444e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index eee64bf86f..eee64bf86f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/LICENSE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/LICENSE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/NOTICE b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/NOTICE
index 51042eab05..51042eab05 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/NOTICE
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ac73ea98f0..ac73ea98f0 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index 878ef9c18e..878ef9c18e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/README
index 374c0f0a8b..374c0f0a8b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/pom.xml
index 53063357a2..53063357a2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/build.xml
index 008953e63b..008953e63b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/pom.xml
index 611c632bf2..611c632bf2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index e2d69eddf6..e2d69eddf6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index b95468acd8..b95468acd8 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index 19afe61fd3..19afe61fd3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 603cc17af9..603cc17af9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 12e40d334b..12e40d334b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/README
index 28eccbdebb..28eccbdebb 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/build.xml
index b95847f600..b95847f600 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/build.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/calculator.png b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/calculator.png
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/calculator.svg b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/calculator.svg
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/pom.xml
index 590fa6f6ea..590fa6f6ea 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
index 461c970373..461c970373 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/logging.properties b/sca-java-2.x/tags/2.0-M4-RC1/samples/logging.properties
index cf452e7812..cf452e7812 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/logging.properties
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/logging.properties
diff --git a/tags/java/sca/2.0-M4-RC1/samples/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/pom.xml
index 6ada609ce9..6ada609ce9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/pom.xml
index caf5add248..caf5add248 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
index 3ffe604ef7..3ffe604ef7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/pom.xml
index 09dddbd07d..09dddbd07d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index 5c52638661..5c52638661 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/pom.xml
index 32799fbf46..32799fbf46 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index c59c7a8f6d..c59c7a8f6d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/pom.xml
index 777178748f..777178748f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/pom.xml
index 9674729947..9674729947 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/README b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/README
index 00568d9bb0..00568d9bb0 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/README
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/README
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/pom.xml
index ce70092d3d..ce70092d3d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
index 8b19af7a52..8b19af7a52 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
index fb83b26315..fb83b26315 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
index fb9d3e2f82..fb9d3e2f82 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
index cacb88b5e3..cacb88b5e3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/resources/rest.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/resources/rest.composite
index 7f76f5946d..7f76f5946d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/resources/rest.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/resources/rest.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
index 745164bf8d..745164bf8d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
index 9fc16372b3..9fc16372b3 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
index 3a670696e4..3a670696e4 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/style.css b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/style.css
index 0f1cea3aaf..0f1cea3aaf 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/style.css
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/src/main/webapp/style.css
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/target/classes/rest.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/target/classes/rest.composite
index 70b83fd986..70b83fd986 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-rest/target/classes/rest.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-rest/target/classes/rest.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/pom.xml
index e979a251c7..e979a251c7 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/pom.xml
index 740a730766..740a730766 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index a23399569a..a23399569a 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 77fa204a15..77fa204a15 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/pom.xml
index 15f7f7dbf2..15f7f7dbf2 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
index 61eb207e23..61eb207e23 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
index 061f4c58ae..061f4c58ae 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
index fdd91b0933..fdd91b0933 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
index e7d864c5e6..e7d864c5e6 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
index 85f2c00dbc..85f2c00dbc 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
index 1e24577860..1e24577860 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
index a52d6b6cbe..a52d6b6cbe 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
index 3783b7bf82..3783b7bf82 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/pom.xml
index 496b1ea54d..496b1ea54d 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/pom.xml
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
index 8d220029a5..8d220029a5 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
index 045aa4674f..045aa4674f 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index d7b237641c..d7b237641c 100644
--- a/tags/java/sca/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml