Moving 2.x tags

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

245 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/2.0-M3/samples/README b/sca-java-2.x/tags/2.0-M3/samples/README
index 4ccefa3695..4ccefa3695 100644
--- a/tags/java/sca/2.0-M3/samples/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/README
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/README b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/README
index fb5afcc7ec..fb5afcc7ec 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/README
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/build.xml
index e13ec494b0..e13ec494b0 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/calculator.png b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/calculator.png
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/calculator.svg b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/calculator.svg
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/pom.xml
index ceacda1864..ceacda1864 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
index 7e5ff160f0..7e5ff160f0 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
index 6620f6a5e7..6620f6a5e7 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
index 3f6ecfdb03..3f6ecfdb03 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/resources/Calculator.composite
index 29dd7e3b6f..29dd7e3b6f 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index bc90f0e566..bc90f0e566 100644
--- a/tags/java/sca/2.0-M3/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/build-common.xml b/sca-java-2.x/tags/2.0-M3/samples/build-common.xml
index 52d6539694..52d6539694 100644
--- a/tags/java/sca/2.0-M3/samples/build-common.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/build-common.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/README b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/README
index 7f76542622..7f76542622 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/README
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/build.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/build.xml
index 75c4839cfa..75c4839cfa 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/calculator.png b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/calculator.png
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/calculator.svg b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/calculator.svg
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/pom.xml
index b9c86f469e..b9c86f469e 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index b49e1da130..b49e1da130 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/README b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/README
index 332526d43a..332526d43a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/README
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/build.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/pom.xml
index dcd40849ff..dcd40849ff 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index 9d9b0a9ffb..9d9b0a9ffb 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/README b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/README
index 07b6dd9713..07b6dd9713 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/README
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/build.xml
index 16d94c3b0b..16d94c3b0b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/pom.xml
index 28ab4cdf99..28ab4cdf99 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index 3ee36be233..3ee36be233 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 0bac3da45c..0bac3da45c 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5510954e0..a5510954e0 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index b7aa70f122..b7aa70f122 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/README b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/README
index 144881134b..144881134b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/README
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/build.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/build.xml
index a0889ccc8a..a0889ccc8a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/pom.xml
index 53fa0c7499..53fa0c7499 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index ffa40d0234..ffa40d0234 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index b0a46b6dd0..b0a46b6dd0 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 02614ad6e1..02614ad6e1 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
index 10140b7bc1..10140b7bc1 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index eb824679a8..eb824679a8 100644
--- a/tags/java/sca/2.0-M3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/README b/sca-java-2.x/tags/2.0-M3/samples/calculator/README
index 56c22d9c89..56c22d9c89 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/README
diff --git a/tags/java/sca/2.0-M3/samples/calculator/build.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator/build.xml
index 4411cae659..4411cae659 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator/calculator.png b/sca-java-2.x/tags/2.0-M3/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/calculator.png
diff --git a/tags/java/sca/2.0-M3/samples/calculator/calculator.svg b/sca-java-2.x/tags/2.0-M3/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/calculator.svg
diff --git a/tags/java/sca/2.0-M3/samples/calculator/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator/pom.xml
index a4d5828c37..a4d5828c37 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 03fc56ceb3..03fc56ceb3 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/resources/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
index 10140b7bc1..10140b7bc1 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 73c7d872b9..73c7d872b9 100644
--- a/tags/java/sca/2.0-M3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/LICENSE
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 2345c785a7..2345c785a7 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/NOTICE
index 51042eab05..51042eab05 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/NOTICE
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index bf4ccc3d28..bf4ccc3d28 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index e3b690f24a..e3b690f24a 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index b939a5de80..b939a5de80 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index 2bf897d72a..2bf897d72a 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index 6f6f4bdce6..6f6f4bdce6 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c9fb3818b8..c9fb3818b8 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 4af00695da..4af00695da 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/README b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/README
index 9e616c1f50..9e616c1f50 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/README
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/pom.xml
index 0cc71de18b..0cc71de18b 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index e0a6622136..e0a6622136 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index 028f860885..028f860885 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index e928317c2e..e928317c2e 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f9e606bd9a..f9e606bd9a 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 565670963f..565670963f 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index ed7083fb29..ed7083fb29 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index 332ba44396..332ba44396 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index faf61d11e4..faf61d11e4 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index bca04d11a4..bca04d11a4 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/LICENSE b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/LICENSE
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 4b7b7ec71b..4b7b7ec71b 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/NOTICE b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/NOTICE
index 51042eab05..51042eab05 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/NOTICE
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fe0bbf21df..fe0bbf21df 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 457588bfb6..457588bfb6 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 1a35665803..1a35665803 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 92b0ac7bf9..92b0ac7bf9 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index 7109300293..7109300293 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/README b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/README
index 374c0f0a8b..374c0f0a8b 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/README
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/pom.xml
index cc338ab61a..cc338ab61a 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index 796b1afe61..796b1afe61 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index ac49cbcb12..ac49cbcb12 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 9c80c5beb9..9c80c5beb9 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 046e8cf565..046e8cf565 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index 1a3e36f571..1a3e36f571 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index d573f6b8fa..d573f6b8fa 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index d735ce8172..d735ce8172 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index 8ba4b85247..8ba4b85247 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 7f96067764..7f96067764 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index d4bede0d98..d4bede0d98 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 958e744b41..958e744b41 100644
--- a/tags/java/sca/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/README
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/build.xml b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/build.xml
index 890a6427b8..890a6427b8 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/pom.xml
index 8b6fcdb3ad..8b6fcdb3ad 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index e2d69eddf6..e2d69eddf6 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
index ae7be07be6..ae7be07be6 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index 8378a15824..8378a15824 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 603cc17af9..603cc17af9 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 12e40d334b..12e40d334b 100644
--- a/tags/java/sca/2.0-M3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/README b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/README
index 28eccbdebb..28eccbdebb 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/README
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/README
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/build.xml
index 0d9b56c3f3..0d9b56c3f3 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/build.xml
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/calculator.png b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/calculator.png
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/calculator.svg b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/calculator.svg
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/pom.xml
index dcd3da2d3d..dcd3da2d3d 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
index 461c970373..461c970373 100644
--- a/tags/java/sca/2.0-M3/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M3/samples/logging.properties b/sca-java-2.x/tags/2.0-M3/samples/logging.properties
index cf452e7812..cf452e7812 100644
--- a/tags/java/sca/2.0-M3/samples/logging.properties
+++ b/sca-java-2.x/tags/2.0-M3/samples/logging.properties
diff --git a/tags/java/sca/2.0-M3/samples/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/pom.xml
index da1c2c27ea..da1c2c27ea 100644
--- a/tags/java/sca/2.0-M3/samples/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/pom.xml
index 62fcc1fcb7..62fcc1fcb7 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
index 27d7a2297a..27d7a2297a 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
index 46f96314f8..46f96314f8 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
index 1cb338b283..1cb338b283 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
index 85d12156d1..85d12156d1 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
index cb3610367b..cb3610367b 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/pom.xml
index 388add1d78..388add1d78 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 931c1ad820..931c1ad820 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 6db7e93188..6db7e93188 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 3a51ed2623..3a51ed2623 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 56ed55b2d5..56ed55b2d5 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index 41098def30..41098def30 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/pom.xml
index 3855293a21..3855293a21 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 56ed55b2d5..56ed55b2d5 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index a5b03d4904..a5b03d4904 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/pom.xml
index 634a5351f9..634a5351f9 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 3d8defc611..3d8defc611 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index c3230b5cdd..c3230b5cdd 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index be7c5f0a31..be7c5f0a31 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 56ed55b2d5..56ed55b2d5 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index 8fd6a6614a..8fd6a6614a 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/pom.xml
index 4a8189500f..4a8189500f 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 98c35dd431..98c35dd431 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 75ee7c2843..75ee7c2843 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index a23399569a..a23399569a 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 77fa204a15..77fa204a15 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 56ed55b2d5..56ed55b2d5 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index 0a16144519..0a16144519 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/pom.xml
index 5a6be294f7..5a6be294f7 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/pom.xml
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
index 010ca34f00..010ca34f00 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
index f0609d9eb9..f0609d9eb9 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
diff --git a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index f13afbfb74..f13afbfb74 100644
--- a/tags/java/sca/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml