326 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/pom.xml
index 1ba7e0385c..1ba7e0385c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
index 9937323993..9937323993 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
index aa36b6009b..aa36b6009b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
index a5e6d75d24..a5e6d75d24 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
index 1eacb94b19..1eacb94b19 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
index 9c046a9ca1..9c046a9ca1 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/pom.xml
index 49f58baa34..49f58baa34 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/pom.xml
index a0f60bcf6b..a0f60bcf6b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
index 6ae8fd13f6..6ae8fd13f6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorAsyncHandler.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorAsyncHandler.java
index abaeef8062..abaeef8062 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorAsyncHandler.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorAsyncHandler.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
index cc1d1d8d46..cc1d1d8d46 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
index 45bdd265d4..45bdd265d4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsync.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsync.java
index 3979529595..3979529595 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsync.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsync.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsyncImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsyncImpl.java
index 1906f46f5b..1906f46f5b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsyncImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsyncImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceProxyImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceProxyImpl.java
index 69c96fe892..69c96fe892 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceProxyImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceProxyImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceSyncImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceSyncImpl.java
index 615a4f4f11..615a4f4f11 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceSyncImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceSyncImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
index 6117d436db..6117d436db 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
index 374ef27e2b..374ef27e2b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/deploy.sh b/sca-java-2.x/trunk/samples/learning-more/binding-comet/deploy.sh
index eb53bd5c76..eb53bd5c76 100755
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/deploy.sh
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/deploy.sh
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
index 5f28205da4..5f28205da4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
index eecc6044ea..eecc6044ea 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
index 00cbe73e82..00cbe73e82 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
index afbdcbc8d7..afbdcbc8d7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
index 4278ef975b..4278ef975b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 55f935fa9f..55f935fa9f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
index 092988213b..092988213b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
index ff2da3a360..ff2da3a360 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
index aaa23f0b8a..aaa23f0b8a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
index 8696f76c50..8696f76c50 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.composite
index 05b2ddd0d7..05b2ddd0d7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/index.html
index 0387e67adb..0387e67adb 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/index.html
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/index.html
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/README b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
index 36714c67fc..36714c67fc 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/pom.xml
index 586937b5e5..586937b5e5 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
index 71724ee7ae..71724ee7ae 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e16b352021..e16b352021 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
index dc0df8756c..dc0df8756c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b7e216baf7..b7e216baf7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
index 6d22806e8f..6d22806e8f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/build.xml
index 7d0ce122dd..7d0ce122dd 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/pom.xml
index 7e08ce52be..7e08ce52be 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
index bb39e961b4..bb39e961b4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index 8eabfa6773..8eabfa6773 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
index 5f1add2431..5f1add2431 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
index 52d05e075b..52d05e075b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/README
index 2f169419ba..2f169419ba 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/build.xml
index fe28a46b7c..fe28a46b7c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/pom.xml
index c10d764ff1..c10d764ff1 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/README
index cb25027f14..cb25027f14 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/build.xml
index 888a1c88b7..888a1c88b7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/pom.xml
index 5cd39e96bb..5cd39e96bb 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
index 073687983d..073687983d 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-rmi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/README b/sca-java-2.x/trunk/samples/learning-more/binding-sca/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/README
index 4777c5ad88..4777c5ad88 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/build.xml
index 593e1ba7a4..593e1ba7a4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/pom.xml
index c877155853..c877155853 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-sca/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
index e3cc9d6e43..e3cc9d6e43 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-sca/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/README
index a1f34e0e8a..a1f34e0e8a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/build.xml
index 69661f7b5e..69661f7b5e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.odg b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.odg
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.odg
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.png b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.png
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.png
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/pom.xml
index a177a043d5..a177a043d5 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
index 138213b5fc..138213b5fc 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
index 3688ebcb85..3688ebcb85 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3a7548cd47..3a7548cd47 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/binding-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
index bfac74c8c0..bfac74c8c0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/binding-ws/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index 1965b571a9..1965b571a9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
index 77a4cbae9e..77a4cbae9e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
index 926208b388..926208b388 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f75cc6444e..f75cc6444e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index eee64bf86f..eee64bf86f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ded82797b5..ded82797b5 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index f10b577e87..f10b577e87 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
index e8d311298e..e8d311298e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
index 0394373342..0394373342 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index aa09b27139..aa09b27139 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/pom.xml
index c3021a3cc5..c3021a3cc5 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/dynamic/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dynamic/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c7250912b0..c7250912b0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
index 57126842a4..57126842a4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
index cf7faab1e8..cf7faab1e8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 1dff21ab6b..1dff21ab6b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
index c64e999fc6..c64e999fc6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/README
index e2cf7cd522..e2cf7cd522 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
index 2e06ff7e05..2e06ff7e05 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 2f37da0707..2f37da0707 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/pom.xml
index 56d975dea8..56d975dea8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/implementation.osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/implementation.osgi/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
index 52fc787d75..52fc787d75 100644
--- a/sca-java-2.x/trunk/samples/sca-features/distributed-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/README b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/README
index 3c3ef5e3d5..3c3ef5e3d5 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/pom.xml
index 47aff7e941..47aff7e941 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/Java.java
index 6c9240005f..6c9240005f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/Java.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDL.java
index 655770ec32..655770ec32 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDL.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDLReference.java
index cad8478a2a..cad8478a2a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDLReference.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
index 0ccbcc9e36..0ccbcc9e36 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/ImplUtil.java
index abd4cd7ab0..abd4cd7ab0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/ImplUtil.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
index 41ce71a732..41ce71a732 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
index 6017030d35..6017030d35 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
index 244251c4c9..244251c4c9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProvider.java
index 5d946b037b..5d946b037b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProvider.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
index 4ad24d33ff..4ad24d33ff 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
index 6c5317274f..6c5317274f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
index a6882a0103..a6882a0103 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 908ac95a2e..908ac95a2e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 85aff44074..85aff44074 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 32a7efcaf9..32a7efcaf9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/sample/impl/sample.xsd
index c057aef1c1..c057aef1c1 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/sample/impl/sample.xsd
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Client.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Client.java
index 1b7e11c786..1b7e11c786 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Client.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Client.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/ClientTest.java
index 92291c98a1..92291c98a1 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/ClientTest.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Hello.java
index 247fc8aa78..247fc8aa78 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Hello.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/JelloTest.java
index 5c999a6c80..5c999a6c80 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/JelloTest.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Upper.java
index 9c772b3487..9c772b3487 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Upper.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/UpperTest.java
index 5399e4410d..5399e4410d 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/UpperTest.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/WelloTest.java
index 1bb9fc11ce..1bb9fc11ce 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/WelloTest.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Xutil.java
index ce89f9dd8c..ce89f9dd8c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Xutil.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
index 406dbabee0..406dbabee0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
index 8a4768cd9e..8a4768cd9e 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunTestCase.java
index 29bf02d26b..29bf02d26b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
index 61133d0fbf..61133d0fbf 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/TestUtil.java
index 6dcfb33912..6dcfb33912 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/TestUtil.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Hello.wsdl
index 360cea5ff3..360cea5ff3 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Hello.wsdl
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Upper.wsdl
index 8a148bb5e8..8a148bb5e8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Upper.wsdl
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/test.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/test.composite
index 43a75f50a7..43a75f50a7 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/test.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/test.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/README b/sca-java-2.x/trunk/samples/learning-more/implementation-java/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/README
index 9e1ff828ee..9e1ff828ee 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/build.xml
index 8ec250d009..8ec250d009 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/pom.xml
index c3e4ba4208..c3e4ba4208 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 2b791a8e1f..2b791a8e1f 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
index 370e1cf315..370e1cf315 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index c1cd131f40..c1cd131f40 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-java/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
index 96fece7481..96fece7481 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-java/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/README b/sca-java-2.x/trunk/samples/learning-more/implementation-script/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/build.xml
index 91285fdbca..91285fdbca 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/pom.xml
index 61c864a4f0..61c864a4f0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 8e4b082d14..8e4b082d14 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
index d441aa0aea..d441aa0aea 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
index 5f6d88454c..5f6d88454c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
index f4bb4e3471..f4bb4e3471 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 35dc5721b2..35dc5721b2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cce0b5b3ec..cce0b5b3ec 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
index ee768f73f2..ee768f73f2 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/sca-java-2.x/trunk/samples/sca-features/implementation-script/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
index cf719a7918..cf719a7918 100644
--- a/sca-java-2.x/trunk/samples/sca-features/implementation-script/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml
index b2175bbbda..b2175bbbda 100644
--- a/sca-java-2.x/trunk/samples/sca-features/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/README b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README
index 97058ca4c9..97058ca4c9 100644
--- a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/README
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README
diff --git a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
index 6197b12e50..6197b12e50 100644
--- a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
diff --git a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
index edbf528517..edbf528517 100644
--- a/sca-java-2.x/trunk/samples/sca-features/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
diff --git a/sca-java-2.x/trunk/samples/sca-features/sca-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml
index 8a65e9f16d..8a65e9f16d 100644
--- a/sca-java-2.x/trunk/samples/sca-features/sca-client/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml