218 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/pom.xml
index aaa4cf3480..aaa4cf3480 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculateReferenceAsync.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculateReferenceAsync.java
index 630a77d77b..630a77d77b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculateReferenceAsync.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculateReferenceAsync.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorAsyncHandler.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorAsyncHandler.java
index abaeef8062..abaeef8062 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorAsyncHandler.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorAsyncHandler.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorClient.java
index d1ef16c519..d1ef16c519 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorPrintAsyncHandler.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorPrintAsyncHandler.java
index 8faf390974..8faf390974 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorPrintAsyncHandler.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorPrintAsyncHandler.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsync.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsync.java
index fe8a890a92..fe8a890a92 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsync.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsync.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsyncImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsyncImpl.java
index e8b603d10d..e8b603d10d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsyncImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceAsyncImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceProxyImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceProxyImpl.java
index 5b3809bfc9..5b3809bfc9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceProxyImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceProxyImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSync.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSync.java
index bc9de67816..bc9de67816 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSync.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSync.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSyncImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSyncImpl.java
index 9a91313cee..9a91313cee 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSyncImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/java/calculator/CalculatorServiceSyncImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/resources/Calculator.composite
index 6117d436db..6117d436db 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/resources/CalculatorClient.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/resources/CalculatorClient.composite
index 374ef27e2b..374ef27e2b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/test/java/calculator/CalculatorTestCase.java
index b4b5ff85f1..b4b5ff85f1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/async-invocation/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/async-invocation/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/README
index 57702664d7..57702664d7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
index 8a9d1692af..8a9d1692af 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Country.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Country.java
index eedacf01d0..eedacf01d0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Country.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Country.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
index 12cdfb4235..12cdfb4235 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
index 57e2d3e214..57e2d3e214 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryService.java
index e916ecb98b..e916ecb98b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
index ad0786be59..ad0786be59 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/resources/countries.txt b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/resources/countries.txt
index 0ce76f8167..0ce76f8167 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/resources/countries.txt
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/resources/countries.txt
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
index f7cee35452..f7cee35452 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html
index 115ca7bbdb..115ca7bbdb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/README
index 303c63146a..303c63146a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/pom.xml
index d83b1150fc..d83b1150fc 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatService.java
index acb224715a..acb224715a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatServiceImpl.java
index c4f3241c5b..c4f3241c5b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/ChatServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.composite
index c535a38116..c535a38116 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html
index 1aa79ed0b6..1aa79ed0b6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pom.xml
index 5ce3149485..5ce3149485 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/README
index 845ff70e58..845ff70e58 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
index 2c0a9bfb9d..2c0a9bfb9d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java
index bcc6bea7af..bcc6bea7af 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java
index 838d2f317c..838d2f317c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorConsumerService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorConsumerService.java
index c8208e862c..c8208e862c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorConsumerService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorConsumerService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorProducerService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorProducerService.java
index 49d760d171..49d760d171 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorProducerService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessorProducerService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Producer.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Producer.java
index 59307824ce..59307824ce 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Producer.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Producer.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
index 6479e10e99..6479e10e99 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
index 0488c4cb10..0488c4cb10 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/README
index dc69bcf6fc..dc69bcf6fc 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/pom.xml
index ce7bea5be9..ce7bea5be9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
index eecc6044ea..eecc6044ea 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
index 7145e30e03..7145e30e03 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
index a53fac5ed1..a53fac5ed1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
index 2c064a3ae6..2c064a3ae6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 4227667e7f..4227667e7f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
index 83afae696f..83afae696f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
index ff2da3a360..ff2da3a360 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
index aaa23f0b8a..aaa23f0b8a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite
index 20d25fe527..20d25fe527 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html
index 6c3cf7ab5c..6c3cf7ab5c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/README
index a0b90cdf2f..a0b90cdf2f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
index 307a78f6a2..307a78f6a2 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java
index 931e205dd7..931e205dd7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java
index eb30e6f36a..eb30e6f36a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java
index 17ce39a10e..17ce39a10e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java
index 40212d5ba5..40212d5ba5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java
index 20ceacd5f0..20ceacd5f0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt
index 0ce76f8167..0ce76f8167 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
index fc1c177e9b..fc1c177e9b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
index 618c772eb6..618c772eb6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/README
index 5a9381f980..5a9381f980 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/pom.xml
index ad6a82ac6f..ad6a82ac6f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java
index 7ec6a547a9..7ec6a547a9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index 6fd4455ba9..6fd4455ba9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite
index 4e83fee9e8..4e83fee9e8 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
index 2309be8533..2309be8533 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pom.xml
index f75d4bc6da..f75d4bc6da 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/README
index 1ec7d6b807..1ec7d6b807 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
index 8187f56379..8187f56379 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java
index c9d9eb54c4..c9d9eb54c4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java
index d289b361cf..d289b361cf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java
index aa9156b088..aa9156b088 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java
index a9c80cc697..a9c80cc697 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java
index 88a214d843..88a214d843 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
index 743e2b418e..743e2b418e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
index bfacf28236..bfacf28236 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/README
index eb195bc4dc..eb195bc4dc 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/pom.xml
index 811f7b6283..811f7b6283 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java
index 10b46cc55f..10b46cc55f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java
index 7b38a098ac..7b38a098ac 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java
index 14fcdfd8b3..14fcdfd8b3 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java
index 5d9575686b..5d9575686b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java
index e505167b3c..e505167b3c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java
index 67318c67c7..67318c67c7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java
index 67edc140f9..67edc140f9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java
index 462af6d8ab..462af6d8ab 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite
index edf53fa76c..edf53fa76c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
index 5d5ae2c1ca..5d5ae2c1ca 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
index a9c9b2a8f9..a9c9b2a8f9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/README.html b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/README.html
index 18e1c62b74..18e1c62b74 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/README.html
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/README.html
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/README.odt b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/README.odt
index 934c402bdf..934c402bdf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/README.odt
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/README.odt
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/pom.xml
index d4d4921b7b..d4d4921b7b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
index 5e65623761..5e65623761 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
index 2b791a8e1f..2b791a8e1f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
index 3a7326caaa..3a7326caaa 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
index a81b58bced..a81b58bced 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/LICENSE b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/LICENSE
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/LICENSE
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/NOTICE b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/NOTICE
index 7bd7e52af5..7bd7e52af5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/NOTICE
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/NOTICE
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml
index fe0bbf21df..fe0bbf21df 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/calculator-component.xml
index 457588bfb6..457588bfb6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 31bd023710..31bd023710 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/sca-config/calculator-config.xml
index 3350883a1f..3350883a1f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/sca-config/calculator-config.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/README
index 52afa44559..52afa44559 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/dosgi-calculator.png b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml
index 8e5a549439..8e5a549439 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java
index 796b1afe61..796b1afe61 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index b14c9e2f4a..b14c9e2f4a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 9c80c5beb9..9c80c5beb9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index c22706c9f6..c22706c9f6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java
index 1a3e36f571..1a3e36f571 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index d573f6b8fa..d573f6b8fa 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java
index d735ce8172..d735ce8172 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 7f96067764..7f96067764 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 8be6de5e41..8be6de5e41 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 43c4d0bf4b..43c4d0bf4b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/LICENSE b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/LICENSE
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/LICENSE
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/NOTICE b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/NOTICE
index 7bd7e52af5..7bd7e52af5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/NOTICE
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/NOTICE
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/add-component.xml
index bf4ccc3d28..bf4ccc3d28 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/blueprint/operations-module.xml
index e3b690f24a..e3b690f24a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/divide-component.xml
index b939a5de80..b939a5de80 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/multiply-component.xml
index 2bf897d72a..2bf897d72a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/sca-config/operations-config.xml
index 300a7d374c..300a7d374c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/sca-config/operations-config.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/sca-config/operations-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/subtract-component.xml
index 4af00695da..4af00695da 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/README b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/README
index 52afa44559..52afa44559 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/README
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/README
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml
index e7cd56b119..e7cd56b119 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index e0a6622136..e0a6622136 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index 028f860885..028f860885 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index e928317c2e..e928317c2e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index e01265068a..e01265068a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 565670963f..565670963f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index 3407507e3b..3407507e3b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index faf61d11e4..faf61d11e4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 45385889ef..45385889ef 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/pom.xml
index 139323f77f..139323f77f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-dynamic/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-dynamic/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/README.odt b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/README.odt
index 22b73cfc79..22b73cfc79 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/README.odt
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/README.odt
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml
index fe0bbf21df..fe0bbf21df 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/calculator-component.xml
index 457588bfb6..457588bfb6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.componentType
index 5e8e7ebcd3..5e8e7ebcd3 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.composite
index 7ebb64eb8f..7ebb64eb8f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml
index f393f1813e..f393f1813e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java
index 796b1afe61..796b1afe61 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index b7babcc0af..b7babcc0af 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 9c80c5beb9..9c80c5beb9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 906fabfff1..906fabfff1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java
index 1a3e36f571..1a3e36f571 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index d573f6b8fa..d573f6b8fa 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java
index d735ce8172..d735ce8172 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/resources/META-INF/sca-contribution.xml
index 2fae5f5d28..2fae5f5d28 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 7f96067764..7f96067764 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 96a5f7d4eb..96a5f7d4eb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 43c4d0bf4b..43c4d0bf4b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/calculator-bundle/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/add-component.xml
index bf4ccc3d28..bf4ccc3d28 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/blueprint/operations-module.xml
index e3b690f24a..e3b690f24a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/divide-component.xml
index b939a5de80..b939a5de80 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/multiply-component.xml
index 2bf897d72a..2bf897d72a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.componentType
index 74704be28d..74704be28d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.composite
index 816ba3c89c..816ba3c89c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/subtract-component.xml
index 4af00695da..4af00695da 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml
index a8df97bed6..a8df97bed6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index e0a6622136..e0a6622136 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index 028f860885..028f860885 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index e928317c2e..e928317c2e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index 6bc14c1c78..6bc14c1c78 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 565670963f..565670963f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/resources/META-INF/sca-contribution.xml
index 66d93248f0..66d93248f0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index 3407507e3b..3407507e3b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index faf61d11e4..faf61d11e4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index ef58d1f60b..ef58d1f60b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/operations-bundle/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/pom.xml
index e483ef72c1..e483ef72c1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/distributed-osgi-static/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/distributed-osgi-static/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/pom.xml b/sca-java-2.x/tags/2.0.1/samples/learning-more/pom.xml
index 2e08aba90f..2e08aba90f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/samples/learning-more/pom.xml