Rename 2.0-M5.1 release tag

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

399 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/README b/sca-java-2.x/tags/2.0-M5.1/samples/README
index 43b7cb3056..43b7cb3056 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/README b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/README b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/README
index 2f169419ba..2f169419ba 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/build.xml
index fe28a46b7c..fe28a46b7c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/pom.xml
index 1507ead9db..1507ead9db 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/README b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/README
index cb25027f14..cb25027f14 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/build.xml
index 888a1c88b7..888a1c88b7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/pom.xml
index d5f17751f9..d5f17751f9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/pom.xml
index 4f9deb7ce3..4f9deb7ce3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/README b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/README b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/README
index 4777c5ad88..4777c5ad88 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/build.xml
index c109d89c75..c109d89c75 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/pom.xml
index c6933b758a..c6933b758a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/pom.xml
index 6ba062df21..6ba062df21 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/binding-sca/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/README b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/README
index c416ad96a0..c416ad96a0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/pom.xml
index ebf5123e27..ebf5123e27 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/resources/Calculator.composite
index c5e636f769..c5e636f769 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index d6a3ccb24e..d6a3ccb24e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/README b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/README
index 97058ca4c9..97058ca4c9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/pom.xml
index 66f3fac716..66f3fac716 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
index edbf528517..edbf528517 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/README b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/README
index 14636d090e..14636d090e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/build.xml
index b0401d755e..b0401d755e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.odg b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.odg
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.odg
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.png b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/pom.xml
index 64b718729d..64b718729d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
index ac4d7321e7..ac4d7321e7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/README b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/README
index acf18ec8d9..acf18ec8d9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/build.xml
index c4b53cc9cf..c4b53cc9cf 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/pom.xml
index 22853a4b1f..22853a4b1f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
index 2e4a700156..2e4a700156 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c7250912b0..c7250912b0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/README b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/README
index 57126842a4..57126842a4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/pom.xml
index df36ab1ae4..df36ab1ae4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/LICENSE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/NOTICE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 1dff21ab6b..1dff21ab6b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index c64e999fc6..c64e999fc6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/README b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/README
index e2cf7cd522..e2cf7cd522 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/pom.xml
index c878465a26..c878465a26 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 2f37da0707..2f37da0707 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index 1965b571a9..1965b571a9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/README
index 77a4cbae9e..77a4cbae9e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/pom.xml
index 9dabe88970..9dabe88970 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f75cc6444e..f75cc6444e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index eee64bf86f..eee64bf86f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/LICENSE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/NOTICE b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ded82797b5..ded82797b5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index f10b577e87..f10b577e87 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/README b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/README
index e8d311298e..e8d311298e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/pom.xml
index 5232d65f03..5232d65f03 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index aa09b27139..aa09b27139 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/README
index 533743ebf6..533743ebf6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/build.xml
index 008953e63b..008953e63b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/pom.xml
index c06b033e17..c06b033e17 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index 4a56523adb..4a56523adb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index d58768adfa..d58768adfa 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 08350e8417..08350e8417 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index cf966264ef..cf966264ef 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/pom.xml
index f29a86a9a9..f29a86a9a9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
index c2c9c4e44e..c2c9c4e44e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
index 13e08de692..13e08de692 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/pom.xml
index 05b43c67d8..05b43c67d8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
index ac03ea3ca6..ac03ea3ca6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
index 552d100638..552d100638 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld-context.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld-context.xml
index 89b2cfb6f5..89b2cfb6f5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld-context.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld.composite
index 33895dde25..33895dde25 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/README b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/maven-eclipse.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/maven-eclipse.xml
index 3adfca89f4..3adfca89f4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/maven-eclipse.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/maven-eclipse.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/pom.xml
index 1dbe48716f..1dbe48716f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index ebc270811f..ebc270811f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index ff5cb4ceda..ff5cb4ceda 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index fa257a0605..fa257a0605 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
index d222d77b3b..d222d77b3b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
index a988a4156c..a988a4156c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
index b609f58373..b609f58373 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
index f8b2a60f6a..f8b2a60f6a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index 46c819d08c..46c819d08c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index 65b0e294a8..65b0e294a8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
index 0451cee24c..0451cee24c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/test.xsd b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/test.xsd
index 7fd9aa0013..7fd9aa0013 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/test.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/test.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 882819110f..882819110f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 3918f9a4a5..3918f9a4a5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 98487ad88b..98487ad88b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
index b6b4ed2254..b6b4ed2254 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/README b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/README
index ed0f1d0ce4..ed0f1d0ce4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/pom.xml
index b3b0fc3e14..b3b0fc3e14 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/HelloworldImpl.java
index 5bf6a94505..5bf6a94505 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/java/sample/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml
index 91b0c8fa6f..91b0c8fa6f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/helloworld.composite
index 324395c246..324395c246 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-command-line/README b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-command-line/README
index bf963ea98e..bf963ea98e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-command-line/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-command-line/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/README b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/README
index 359e5d134d..359e5d134d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/build.xml
index 89987056d2..89987056d2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/pom.xml
index 16274169d8..16274169d8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
index fdff16c12c..fdff16c12c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
index 9a4a73c556..9a4a73c556 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
index 3c2acbcc46..3c2acbcc46 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/README b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/README
index 01d277ae09..01d277ae09 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/build.xml
index f08d19e472..f08d19e472 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/pom.xml
index 7ed4af1267..7ed4af1267 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
index f4a2f0780c..f4a2f0780c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
index e506f982de..e506f982de 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
index 7b72ec7aee..7b72ec7aee 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-maven/README b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-maven/README
index ff976c3515..ff976c3515 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-maven/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/launcher-maven/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/logging.properties b/sca-java-2.x/tags/2.0-M5.1/samples/logging.properties
index cf452e7812..cf452e7812 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/logging.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/logging.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/pom.xml
index ee8cd25fcb..ee8cd25fcb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/README b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/README
index 46e71bf51e..46e71bf51e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/pom.xml
index 41448c6547..41448c6547 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Cart.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Cart.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Cart.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Catalog.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Catalog.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverter.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Item.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Item.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Item.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Total.java b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/java/services/Total.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Total.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/resources/store.composite
index 7a07b89903..7a07b89903 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
index cdda6bbcad..cdda6bbcad 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index b353a6e759..b353a6e759 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
index bf3fe972ca..bf3fe972ca 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/store.html b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/store.html
index 7fa2e07d5a..7fa2e07d5a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/src/main/webapp/store.html
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/store.html
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/store.png b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.png
index da413edeee..da413edeee 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/store.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/store.svg b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store-webapp/store.svg
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.svg
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/README b/sca-java-2.x/tags/2.0-M5.1/samples/store/README
index d31e4c59b7..d31e4c59b7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/build.xml b/sca-java-2.x/tags/2.0-M5.1/samples/store/build.xml
index bd36a0d398..bd36a0d398 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/build.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/store/pom.xml
index 9a39199fbe..9a39199fbe 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/launch/Launch.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/launch/Launch.java
index 8e4b5839e4..8e4b5839e4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/launch/Launch.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Cart.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Cart.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Catalog.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Catalog.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Item.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Item.java
index fe32cfc828..fe32cfc828 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Item.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Item.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Total.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/java/services/Total.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Total.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/store.composite
index 9c3b79c508..9c3b79c508 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/resources/uiservices/store.html b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/uiservices/store.html
index 000f1f891f..000f1f891f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/uiservices/store.html
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/java/client/Shopper.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/Shopper.java
index 4e2fa63493..4e2fa63493 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/java/client/Shopper.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/Shopper.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/java/client/ShopperImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/ShopperImpl.java
index 05b1800d4f..05b1800d4f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/java/client/ShopperImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/ShopperImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/java/store/StoreTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/store/StoreTestCase.java
index 883aaa76f6..883aaa76f6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/java/store/StoreTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/store/StoreTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/resources/store-client.composite b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/resources/store-client.composite
index c9abe8e996..c9abe8e996 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/src/test/resources/store-client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/resources/store-client.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/store.png b/sca-java-2.x/tags/2.0-M5.1/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/store.png
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/store.png
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/store.svg b/sca-java-2.x/tags/2.0-M5.1/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/store/store.svg
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/store/store.svg
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/pom.xml
index 5fddd14270..5fddd14270 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
index 3d36adadeb..3d36adadeb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/pom.xml
index 7b96841b3b..7b96841b3b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
index 42625b8a78..42625b8a78 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
index 8ce781d6c8..8ce781d6c8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
index 7ff71519e9..7ff71519e9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
index 3c5726a818..3c5726a818 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
index ffe5dd3b2b..ffe5dd3b2b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/pom.xml
index a97551ae8b..a97551ae8b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index c51985bc30..c51985bc30 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/pom.xml
index 63a00a64a8..63a00a64a8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index d41a8535e2..d41a8535e2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index 099b442050..099b442050 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/pom.xml
index bc2b59f7d4..bc2b59f7d4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/pom.xml
index 42110cf72d..42110cf72d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 665957b0eb..665957b0eb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml
index b59d4861b8..b59d4861b8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index 61d722da1f..61d722da1f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/pom.xml
index 7a9231ea67..7a9231ea67 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 7f4359fa43..7f4359fa43 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/README b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/README
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/README
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/pom.xml
index 1226b769b7..1226b769b7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index 85aed34b26..85aed34b26 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java
index f1ccf0b1ba..f1ccf0b1ba 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
index c1c2c6aae0..c1c2c6aae0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/test/resources/test-web.xml b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/resources/test-web.xml
index a68aa28698..a68aa28698 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld/src/test/resources/test-web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/resources/test-web.xml