495 files changed, 0 insertions, 0 deletions

diff --git a/sandbox/samples/sca-features/binding-comet/deploy.sh b/sandbox/samples/temp/binding-comet/deploy.sh
index eb53bd5c76..eb53bd5c76 100755
--- a/sandbox/samples/sca-features/binding-comet/deploy.sh
+++ b/sandbox/samples/temp/binding-comet/deploy.sh
diff --git a/sandbox/samples/sca-features/binding-comet/pom.xml b/sandbox/samples/temp/binding-comet/pom.xml
index 5f28205da4..5f28205da4 100644
--- a/sandbox/samples/sca-features/binding-comet/pom.xml
+++ b/sandbox/samples/temp/binding-comet/pom.xml
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
index eecc6044ea..eecc6044ea 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
index 00cbe73e82..00cbe73e82 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
index afbdcbc8d7..afbdcbc8d7 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
index 4278ef975b..4278ef975b 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 55f935fa9f..55f935fa9f 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
index 092988213b..092988213b 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
index ff2da3a360..ff2da3a360 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
index aaa23f0b8a..aaa23f0b8a 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
+++ b/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/webapp/META-INF/MANIFEST.MF b/sandbox/samples/temp/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml b/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
index 8696f76c50..8696f76c50 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.composite
index 05b2ddd0d7..05b2ddd0d7 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-features/binding-comet/src/main/webapp/index.html b/sandbox/samples/temp/binding-comet/src/main/webapp/index.html
index 0387e67adb..0387e67adb 100644
--- a/sandbox/samples/sca-features/binding-comet/src/main/webapp/index.html
+++ b/sandbox/samples/temp/binding-comet/src/main/webapp/index.html
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/README b/sandbox/samples/temp/binding-jsonrpc/README
index 18ba62d494..18ba62d494 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/README
+++ b/sandbox/samples/temp/binding-jsonrpc/README
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
index 36714c67fc..36714c67fc 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/pom.xml b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/pom.xml
index 586937b5e5..586937b5e5 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/pom.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/pom.xml
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
index 71724ee7ae..71724ee7ae 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e16b352021..e16b352021 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
index dc0df8756c..dc0df8756c 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b7e216baf7..b7e216baf7 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
index 6d22806e8f..6d22806e8f 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/README b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/README
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/README
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/build.xml b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/build.xml
index 7d0ce122dd..7d0ce122dd 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/build.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/build.xml
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/pom.xml b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/pom.xml
index 7e08ce52be..7e08ce52be 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/pom.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/pom.xml
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
index bb39e961b4..bb39e961b4 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index 8eabfa6773..8eabfa6773 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
index 5f1add2431..5f1add2431 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-features/binding-jsonrpc/pom.xml b/sandbox/samples/temp/binding-jsonrpc/pom.xml
index 52d05e075b..52d05e075b 100644
--- a/sandbox/samples/sca-features/binding-jsonrpc/pom.xml
+++ b/sandbox/samples/temp/binding-jsonrpc/pom.xml
diff --git a/sandbox/samples/sca-features/binding-rmi/README b/sandbox/samples/temp/binding-rmi/README
index 18ba62d494..18ba62d494 100644
--- a/sandbox/samples/sca-features/binding-rmi/README
+++ b/sandbox/samples/temp/binding-rmi/README
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/README b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/README
index 2f169419ba..2f169419ba 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/README
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/README
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/build.xml b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/build.xml
index fe28a46b7c..fe28a46b7c 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/build.xml
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/pom.xml b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/pom.xml
index c10d764ff1..c10d764ff1 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/pom.xml
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/README b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/README
index cb25027f14..cb25027f14 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/README
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/README
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/build.xml b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/build.xml
index 888a1c88b7..888a1c88b7 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/build.xml
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/build.xml
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/pom.xml b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/pom.xml
index 5cd39e96bb..5cd39e96bb 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/pom.xml
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sandbox/samples/sca-features/binding-rmi/pom.xml b/sandbox/samples/temp/binding-rmi/pom.xml
index 073687983d..073687983d 100644
--- a/sandbox/samples/sca-features/binding-rmi/pom.xml
+++ b/sandbox/samples/temp/binding-rmi/pom.xml
diff --git a/sandbox/samples/sca-features/binding-sca/README b/sandbox/samples/temp/binding-sca/README
index 18ba62d494..18ba62d494 100644
--- a/sandbox/samples/sca-features/binding-sca/README
+++ b/sandbox/samples/temp/binding-sca/README
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/README b/sandbox/samples/temp/binding-sca/contribution-calculator/README
index 4777c5ad88..4777c5ad88 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/README
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/README
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/build.xml b/sandbox/samples/temp/binding-sca/contribution-calculator/build.xml
index 593e1ba7a4..593e1ba7a4 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/build.xml
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/build.xml
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/pom.xml b/sandbox/samples/temp/binding-sca/contribution-calculator/pom.xml
index c877155853..c877155853 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/pom.xml
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/pom.xml
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-features/binding-sca/pom.xml b/sandbox/samples/temp/binding-sca/pom.xml
index e3cc9d6e43..e3cc9d6e43 100644
--- a/sandbox/samples/sca-features/binding-sca/pom.xml
+++ b/sandbox/samples/temp/binding-sca/pom.xml
diff --git a/sandbox/samples/sca-features/binding-ws/README b/sandbox/samples/temp/binding-ws/README
index 18ba62d494..18ba62d494 100644
--- a/sandbox/samples/sca-features/binding-ws/README
+++ b/sandbox/samples/temp/binding-ws/README
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/README b/sandbox/samples/temp/binding-ws/contribution-calculator/README
index a1f34e0e8a..a1f34e0e8a 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/README
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/README
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/build.xml b/sandbox/samples/temp/binding-ws/contribution-calculator/build.xml
index 69661f7b5e..69661f7b5e 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/build.xml
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/build.xml
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/calculator.odg b/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/calculator.odg
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.odg
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/calculator.png b/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/calculator.png
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.png
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/pom.xml b/sandbox/samples/temp/binding-ws/contribution-calculator/pom.xml
index a177a043d5..a177a043d5 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/pom.xml
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/pom.xml
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
index 138213b5fc..138213b5fc 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
index 3688ebcb85..3688ebcb85 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3a7548cd47..3a7548cd47 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sandbox/samples/sca-features/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-features/binding-ws/pom.xml b/sandbox/samples/temp/binding-ws/pom.xml
index bfac74c8c0..bfac74c8c0 100644
--- a/sandbox/samples/sca-features/binding-ws/pom.xml
+++ b/sandbox/samples/temp/binding-ws/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index 1965b571a9..1965b571a9 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
index 77a4cbae9e..77a4cbae9e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
index 926208b388..926208b388 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f75cc6444e..f75cc6444e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index eee64bf86f..eee64bf86f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ded82797b5..ded82797b5 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index f10b577e87..f10b577e87 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/README b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
index e8d311298e..e8d311298e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
index 0394373342..0394373342 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index aa09b27139..aa09b27139 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/dynamic/pom.xml b/sandbox/samples/temp/distributed-osgi/dynamic/pom.xml
index c3021a3cc5..c3021a3cc5 100644
--- a/sandbox/samples/sca-features/distributed-osgi/dynamic/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/dynamic/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c7250912b0..c7250912b0 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
index 57126842a4..57126842a4 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
index cf7faab1e8..cf7faab1e8 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 1dff21ab6b..1dff21ab6b 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
index c64e999fc6..c64e999fc6 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/README b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/README
index e2cf7cd522..e2cf7cd522 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/README
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/README
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
index 2e06ff7e05..2e06ff7e05 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 2f37da0707..2f37da0707 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/pom.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/pom.xml
index 56d975dea8..56d975dea8 100644
--- a/sandbox/samples/sca-features/distributed-osgi/implementation.osgi/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/implementation.osgi/pom.xml
diff --git a/sandbox/samples/sca-features/distributed-osgi/pom.xml b/sandbox/samples/temp/distributed-osgi/pom.xml
index 52fc787d75..52fc787d75 100644
--- a/sandbox/samples/sca-features/distributed-osgi/pom.xml
+++ b/sandbox/samples/temp/distributed-osgi/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/README b/sandbox/samples/temp/helloworld-bpel-contribution/README
index 533743ebf6..533743ebf6 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/README
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/README
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/build.xml b/sandbox/samples/temp/helloworld-bpel-contribution/build.xml
index 008953e63b..008953e63b 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/build.xml
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/build.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.png b/sandbox/samples/temp/helloworld-bpel-contribution/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.png
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/helloworld-bpel.png
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.svg b/sandbox/samples/temp/helloworld-bpel-contribution/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/helloworld-bpel.svg
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/helloworld-bpel.svg
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/pom.xml b/sandbox/samples/temp/helloworld-bpel-contribution/pom.xml
index 3f4be82f71..3f4be82f71 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/pom.xml
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 4a56523adb..4a56523adb 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.bpel b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
index d58768adfa..d58768adfa 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.composite b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/helloworld.composite
index 08350e8417..08350e8417 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.composite
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/helloworld.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
index cf966264ef..cf966264ef 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/log4j.properties b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-contribution/src/main/resources/log4j.properties
+++ b/sandbox/samples/temp/helloworld-bpel-contribution/src/main/resources/log4j.properties
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/README b/sandbox/samples/temp/helloworld-bpel-webapp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/README
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/README
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/pom.xml b/sandbox/samples/temp/helloworld-bpel-webapp/pom.xml
index 1ca3770b74..1ca3770b74 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/pom.xml
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.bpel b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.bpel
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/resources/helloworld.bpel
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite
index 3d36adadeb..3d36adadeb 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/hello.jsp b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/sandbox/samples/sca-extensions/helloworld-bpel-webapp/src/main/webapp/hello.jsp
+++ b/sandbox/samples/temp/helloworld-bpel-webapp/src/main/webapp/hello.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/README b/sandbox/samples/temp/helloworld-jaxrs/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/README
+++ b/sandbox/samples/temp/helloworld-jaxrs/README
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/pom.xml b/sandbox/samples/temp/helloworld-jaxrs/pom.xml
index f414d87837..f414d87837 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/pom.xml
+++ b/sandbox/samples/temp/helloworld-jaxrs/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
index 42625b8a78..42625b8a78 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/application
index 8ce781d6c8..8ce781d6c8 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/application
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/application
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
index 7ff71519e9..7ff71519e9 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
index 3c5726a818..3c5726a818 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
index 50197cdfcb..50197cdfcb 100644
--- a/sandbox/samples/sca-extensions/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/README b/sandbox/samples/temp/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/README
+++ b/sandbox/samples/temp/helloworld-jms/README
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/pom.xml b/sandbox/samples/temp/helloworld-jms/pom.xml
index 326422ed7b..326422ed7b 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/pom.xml
+++ b/sandbox/samples/temp/helloworld-jms/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sandbox/samples/temp/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sandbox/samples/temp/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sandbox/samples/temp/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sandbox/samples/temp/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sandbox/samples/temp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/META-INF/context.xml b/sandbox/samples/temp/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sandbox/samples/temp/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sandbox/samples/temp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sandbox/samples/temp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index c51985bc30..c51985bc30 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/hello.jsp b/sandbox/samples/temp/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/sandbox/samples/sca-extensions/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sandbox/samples/temp/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/README b/sandbox/samples/temp/helloworld-js-client/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/README
+++ b/sandbox/samples/temp/helloworld-js-client/README
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/pom.xml b/sandbox/samples/temp/helloworld-js-client/pom.xml
index 388df0913e..388df0913e 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/pom.xml
+++ b/sandbox/samples/temp/helloworld-js-client/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index d41a8535e2..d41a8535e2 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/hello.html b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/src/main/webapp/hello.html
+++ b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/hello.html
diff --git a/sandbox/samples/sca-extensions/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index 099b442050..099b442050 100644
--- a/sandbox/samples/sca-extensions/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/pom.xml b/sandbox/samples/temp/helloworld-jsf/pom.xml
index 6f2b820e4c..6f2b820e4c 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/pom.xml
+++ b/sandbox/samples/temp/helloworld-jsf/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/index.jsp b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/page2.jsp b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/README b/sandbox/samples/temp/helloworld-jsp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/README
+++ b/sandbox/samples/temp/helloworld-jsp/README
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/pom.xml b/sandbox/samples/temp/helloworld-jsp/pom.xml
index 05a3e23895..05a3e23895 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/pom.xml
+++ b/sandbox/samples/temp/helloworld-jsp/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/hello.jsp b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 665957b0eb..665957b0eb 100644
--- a/sandbox/samples/sca-extensions/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive-ws/README b/sandbox/samples/temp/helloworld-recursive-ws/README
index a21077ba58..a21077ba58 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive-ws/README
+++ b/sandbox/samples/temp/helloworld-recursive-ws/README
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive-ws/pom.xml b/sandbox/samples/temp/helloworld-recursive-ws/pom.xml
index 80432461e4..80432461e4 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive-ws/pom.xml
+++ b/sandbox/samples/temp/helloworld-recursive-ws/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml
index ffc35bb553..ffc35bb553 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite b/sandbox/samples/temp/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite
index 719754224d..719754224d 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite
+++ b/sandbox/samples/temp/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive/README b/sandbox/samples/temp/helloworld-recursive/README
index ed0f1d0ce4..ed0f1d0ce4 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive/README
+++ b/sandbox/samples/temp/helloworld-recursive/README
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive/pom.xml b/sandbox/samples/temp/helloworld-recursive/pom.xml
index 4326970c33..4326970c33 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive/pom.xml
+++ b/sandbox/samples/temp/helloworld-recursive/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml
index 15d9304d05..15d9304d05 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/helloworld-recursive.composite b/sandbox/samples/temp/helloworld-recursive/src/main/resources/helloworld-recursive.composite
index 1094fea85e..1094fea85e 100644
--- a/sandbox/samples/sca-extensions/helloworld-recursive/src/main/resources/helloworld-recursive.composite
+++ b/sandbox/samples/temp/helloworld-recursive/src/main/resources/helloworld-recursive.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-scaclient/pom.xml b/sandbox/samples/temp/helloworld-scaclient/pom.xml
index 4e7f057ca9..4e7f057ca9 100644
--- a/sandbox/samples/sca-extensions/helloworld-scaclient/pom.xml
+++ b/sandbox/samples/temp/helloworld-scaclient/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/Helloworld.java b/sandbox/samples/temp/helloworld-scaclient/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/Helloworld.java
+++ b/sandbox/samples/temp/helloworld-scaclient/src/main/java/sample/Helloworld.java
diff --git a/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java b/sandbox/samples/temp/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
index c2c9c4e44e..c2c9c4e44e 100644
--- a/sandbox/samples/sca-extensions/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
+++ b/sandbox/samples/temp/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
diff --git a/sandbox/samples/sca-extensions/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
index 13e08de692..13e08de692 100644
--- a/sandbox/samples/sca-extensions/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/README b/sandbox/samples/temp/helloworld-servlet/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/README
+++ b/sandbox/samples/temp/helloworld-servlet/README
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/pom.xml b/sandbox/samples/temp/helloworld-servlet/pom.xml
index 45725aaf72..45725aaf72 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/pom.xml
+++ b/sandbox/samples/temp/helloworld-servlet/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/hello.html b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/main/webapp/hello.html
+++ b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/hello.html
diff --git a/sandbox/samples/sca-extensions/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index 61d722da1f..61d722da1f 100644
--- a/sandbox/samples/sca-extensions/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/pom.xml b/sandbox/samples/temp/helloworld-spring-contribution/pom.xml
index b8cb765c38..b8cb765c38 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/pom.xml
+++ b/sandbox/samples/temp/helloworld-spring-contribution/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateService.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateService.java
index 7c50d66a9c..7c50d66a9c 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateService.java
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
index 64bdd86f7c..64bdd86f7c 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/Helloworld.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
index ddcb1d9bc3..ddcb1d9bc3 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
index 125c333ddc..125c333ddc 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
index 552d100638..552d100638 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
index 15e9647bb0..15e9647bb0 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
index 9ecd09974e..9ecd09974e 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld.composite
index 6d356758ae..6d356758ae 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld.composite
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-webapp/pom.xml b/sandbox/samples/temp/helloworld-spring-webapp/pom.xml
index 59f3a25696..59f3a25696 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-webapp/pom.xml
+++ b/sandbox/samples/temp/helloworld-spring-webapp/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
index 49590e00a2..49590e00a2 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java b/sandbox/samples/temp/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
index fa77f08ee2..fa77f08ee2 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
+++ b/sandbox/samples/temp/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml b/sandbox/samples/temp/helloworld-spring-webapp/src/test/resources/test-web.xml
index ac5c134454..ac5c134454 100644
--- a/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml
+++ b/sandbox/samples/temp/helloworld-spring-webapp/src/test/resources/test-web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/pom.xml b/sandbox/samples/temp/helloworld-stripes/pom.xml
index 16259aba62..16259aba62 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/pom.xml
+++ b/sandbox/samples/temp/helloworld-stripes/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sandbox/samples/temp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sandbox/samples/temp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/StripesResources.properties b/sandbox/samples/temp/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/log4j.properties b/sandbox/samples/temp/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/index.html b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/main/webapp/index.html
+++ b/sandbox/samples/temp/helloworld-stripes/src/main/webapp/index.html
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/README b/sandbox/samples/temp/helloworld-stripes/src/test/java/README
index 828aadb0f1..828aadb0f1 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/README
+++ b/sandbox/samples/temp/helloworld-stripes/src/test/java/README
diff --git a/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 7f4359fa43..7f4359fa43 100644
--- a/sandbox/samples/sca-extensions/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sandbox/samples/temp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/README b/sandbox/samples/temp/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/README
+++ b/sandbox/samples/temp/helloworld-ws-sdo/README
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/build.xml b/sandbox/samples/temp/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/build.xml
+++ b/sandbox/samples/temp/helloworld-ws-sdo/build.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/helloworld-ws-sdo.png b/sandbox/samples/temp/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sandbox/samples/temp/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/maven-eclipse.xml b/sandbox/samples/temp/helloworld-ws-sdo/maven-eclipse.xml
index 3adfca89f4..3adfca89f4 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/maven-eclipse.xml
+++ b/sandbox/samples/temp/helloworld-ws-sdo/maven-eclipse.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/pom.xml b/sandbox/samples/temp/helloworld-ws-sdo/pom.xml
index c5bf5ff186..c5bf5ff186 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/pom.xml
+++ b/sandbox/samples/temp/helloworld-ws-sdo/pom.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index ebc270811f..ebc270811f 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index ff5cb4ceda..ff5cb4ceda 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index fa257a0605..fa257a0605 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
index d222d77b3b..d222d77b3b 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
index a988a4156c..a988a4156c 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
index b609f58373..b609f58373 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
index f8b2a60f6a..f8b2a60f6a 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index 46c819d08c..46c819d08c 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index 65b0e294a8..65b0e294a8 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/logging.properties b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
index 0451cee24c..0451cee24c 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/test.xsd b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/test.xsd
index 7fd9aa0013..7fd9aa0013 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/test.xsd
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/test.xsd
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 882819110f..882819110f 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 3918f9a4a5..3918f9a4a5 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 98487ad88b..98487ad88b 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java b/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
index b6b4ed2254..b6b4ed2254 100644
--- a/sandbox/samples/sca-extensions/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
+++ b/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
diff --git a/sandbox/samples/sca-features/implementation-extension/README b/sandbox/samples/temp/implementation-extension/README
index 3c3ef5e3d5..3c3ef5e3d5 100644
--- a/sandbox/samples/sca-features/implementation-extension/README
+++ b/sandbox/samples/temp/implementation-extension/README
diff --git a/sandbox/samples/sca-features/implementation-extension/pom.xml b/sandbox/samples/temp/implementation-extension/pom.xml
index 47aff7e941..47aff7e941 100644
--- a/sandbox/samples/sca-features/implementation-extension/pom.xml
+++ b/sandbox/samples/temp/implementation-extension/pom.xml
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/api/Java.java
index 6c9240005f..6c9240005f 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/api/Java.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/api/WSDL.java
index 655770ec32..655770ec32 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/api/WSDL.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/api/WSDLReference.java
index cad8478a2a..cad8478a2a 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/api/WSDLReference.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
index 0ccbcc9e36..0ccbcc9e36 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/ImplUtil.java
index abd4cd7ab0..abd4cd7ab0 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/ImplUtil.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
index 41ce71a732..41ce71a732 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
index 6017030d35..6017030d35 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
index 244251c4c9..244251c4c9 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleProvider.java
index 5d946b037b..5d946b037b 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleProvider.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
index 4ad24d33ff..4ad24d33ff 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
index 6c5317274f..6c5317274f 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
index a6882a0103..a6882a0103 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
+++ b/sandbox/samples/temp/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sandbox/samples/temp/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 908ac95a2e..908ac95a2e 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sandbox/samples/temp/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sandbox/samples/temp/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 85aff44074..85aff44074 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sandbox/samples/temp/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sandbox/samples/temp/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 32a7efcaf9..32a7efcaf9 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sandbox/samples/temp/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sandbox/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd b/sandbox/samples/temp/implementation-extension/src/main/resources/sample/impl/sample.xsd
index c057aef1c1..c057aef1c1 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd
+++ b/sandbox/samples/temp/implementation-extension/src/main/resources/sample/impl/sample.xsd
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Client.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Client.java
index 1b7e11c786..1b7e11c786 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Client.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Client.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/ClientTest.java
index 92291c98a1..92291c98a1 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/ClientTest.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Hello.java
index 247fc8aa78..247fc8aa78 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Hello.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/JelloTest.java
index 5c999a6c80..5c999a6c80 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/JelloTest.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Upper.java
index 9c772b3487..9c772b3487 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Upper.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/UpperTest.java
index 5399e4410d..5399e4410d 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/UpperTest.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/WelloTest.java
index 1bb9fc11ce..1bb9fc11ce 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/WelloTest.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Xutil.java
index ce89f9dd8c..ce89f9dd8c 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/Xutil.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
index 406dbabee0..406dbabee0 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
index 8a4768cd9e..8a4768cd9e 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/RunTestCase.java
index 29bf02d26b..29bf02d26b 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/RunTestCase.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
index 61133d0fbf..61133d0fbf 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/TestUtil.java
index 6dcfb33912..6dcfb33912 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java
+++ b/sandbox/samples/temp/implementation-extension/src/test/java/sample/impl/TestUtil.java
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl b/sandbox/samples/temp/implementation-extension/src/test/resources/Hello.wsdl
index 360cea5ff3..360cea5ff3 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl
+++ b/sandbox/samples/temp/implementation-extension/src/test/resources/Hello.wsdl
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl b/sandbox/samples/temp/implementation-extension/src/test/resources/Upper.wsdl
index 8a148bb5e8..8a148bb5e8 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl
+++ b/sandbox/samples/temp/implementation-extension/src/test/resources/Upper.wsdl
diff --git a/sandbox/samples/sca-features/implementation-extension/src/test/resources/test.composite b/sandbox/samples/temp/implementation-extension/src/test/resources/test.composite
index 43a75f50a7..43a75f50a7 100644
--- a/sandbox/samples/sca-features/implementation-extension/src/test/resources/test.composite
+++ b/sandbox/samples/temp/implementation-extension/src/test/resources/test.composite
diff --git a/sandbox/samples/sca-features/implementation-java/README b/sandbox/samples/temp/implementation-java/README
index 18ba62d494..18ba62d494 100644
--- a/sandbox/samples/sca-features/implementation-java/README
+++ b/sandbox/samples/temp/implementation-java/README
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/README b/sandbox/samples/temp/implementation-java/contribution-calculator/README
index 9e1ff828ee..9e1ff828ee 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/README
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/README
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/build.xml b/sandbox/samples/temp/implementation-java/contribution-calculator/build.xml
index 8ec250d009..8ec250d009 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/build.xml
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/build.xml
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/pom.xml b/sandbox/samples/temp/implementation-java/contribution-calculator/pom.xml
index c3e4ba4208..c3e4ba4208 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/pom.xml
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/pom.xml
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 2b791a8e1f..2b791a8e1f 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
index 370e1cf315..370e1cf315 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index c1cd131f40..c1cd131f40 100644
--- a/sandbox/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-features/implementation-java/pom.xml b/sandbox/samples/temp/implementation-java/pom.xml
index 96fece7481..96fece7481 100644
--- a/sandbox/samples/sca-features/implementation-java/pom.xml
+++ b/sandbox/samples/temp/implementation-java/pom.xml
diff --git a/sandbox/samples/sca-features/implementation-script/README b/sandbox/samples/temp/implementation-script/README
index 18ba62d494..18ba62d494 100644
--- a/sandbox/samples/sca-features/implementation-script/README
+++ b/sandbox/samples/temp/implementation-script/README
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/README b/sandbox/samples/temp/implementation-script/contribution-calculator/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/README
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/README
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/build.xml b/sandbox/samples/temp/implementation-script/contribution-calculator/build.xml
index 91285fdbca..91285fdbca 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/build.xml
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/build.xml
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/pom.xml b/sandbox/samples/temp/implementation-script/contribution-calculator/pom.xml
index 61c864a4f0..61c864a4f0 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/pom.xml
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/pom.xml
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 8e4b082d14..8e4b082d14 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
index d441aa0aea..d441aa0aea 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
index 5f6d88454c..5f6d88454c 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
index f4bb4e3471..f4bb4e3471 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 35dc5721b2..35dc5721b2 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cce0b5b3ec..cce0b5b3ec 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
index ee768f73f2..ee768f73f2 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/sandbox/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sandbox/samples/temp/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/sandbox/samples/sca-features/implementation-script/pom.xml b/sandbox/samples/temp/implementation-script/pom.xml
index cf719a7918..cf719a7918 100644
--- a/sandbox/samples/sca-features/implementation-script/pom.xml
+++ b/sandbox/samples/temp/implementation-script/pom.xml
diff --git a/sandbox/samples/sca-extensions/logging-scribe/README b/sandbox/samples/temp/logging-scribe/README
index 92f339ead5..92f339ead5 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/README
+++ b/sandbox/samples/temp/logging-scribe/README
diff --git a/sandbox/samples/sca-extensions/logging-scribe/pom.xml b/sandbox/samples/temp/logging-scribe/pom.xml
index a21897ca5b..a21897ca5b 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/pom.xml
+++ b/sandbox/samples/temp/logging-scribe/pom.xml
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java b/sandbox/samples/temp/logging-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java
index 1708066955..1708066955 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java b/sandbox/samples/temp/logging-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java
index bb7b132477..bb7b132477 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/scribe/thrift/LogEntry.java b/sandbox/samples/temp/logging-scribe/src/main/java/generated/scribe/thrift/LogEntry.java
index c06570d9ef..c06570d9ef 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/scribe/thrift/LogEntry.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/generated/scribe/thrift/LogEntry.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/scribe/thrift/ResultCode.java b/sandbox/samples/temp/logging-scribe/src/main/java/generated/scribe/thrift/ResultCode.java
index 2bf826d06a..2bf826d06a 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/scribe/thrift/ResultCode.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/generated/scribe/thrift/ResultCode.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/scribe/thrift/scribe.java b/sandbox/samples/temp/logging-scribe/src/main/java/generated/scribe/thrift/scribe.java
index 40b4ca774b..40b4ca774b 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/generated/scribe/thrift/scribe.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/generated/scribe/thrift/scribe.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/HelloWorld.java b/sandbox/samples/temp/logging-scribe/src/main/java/sample/HelloWorld.java
index 7fb20fe5f4..7fb20fe5f4 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/HelloWorld.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/sample/HelloWorld.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/HelloWorldImpl.java b/sandbox/samples/temp/logging-scribe/src/main/java/sample/HelloWorldImpl.java
index d90af4c792..d90af4c792 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/HelloWorldImpl.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/sample/HelloWorldImpl.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/Logger.java b/sandbox/samples/temp/logging-scribe/src/main/java/sample/Logger.java
index aab9ec27c1..aab9ec27c1 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/Logger.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/sample/Logger.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/ScribeLoggerImpl.java b/sandbox/samples/temp/logging-scribe/src/main/java/sample/ScribeLoggerImpl.java
index 10c2e079fd..10c2e079fd 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/java/sample/ScribeLoggerImpl.java
+++ b/sandbox/samples/temp/logging-scribe/src/main/java/sample/ScribeLoggerImpl.java
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/logging-scribe/src/main/resources/META-INF/sca-contribution.xml
index fe284f2c10..fe284f2c10 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/temp/logging-scribe/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/fb303.thrift b/sandbox/samples/temp/logging-scribe/src/main/resources/fb303.thrift
index 4926b7a736..4926b7a736 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/fb303.thrift
+++ b/sandbox/samples/temp/logging-scribe/src/main/resources/fb303.thrift
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/scribe.composite b/sandbox/samples/temp/logging-scribe/src/main/resources/scribe.composite
index b075a13843..b075a13843 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/scribe.composite
+++ b/sandbox/samples/temp/logging-scribe/src/main/resources/scribe.composite
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/scribe.thrift b/sandbox/samples/temp/logging-scribe/src/main/resources/scribe.thrift
index 468412f38e..468412f38e 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/main/resources/scribe.thrift
+++ b/sandbox/samples/temp/logging-scribe/src/main/resources/scribe.thrift
diff --git a/sandbox/samples/sca-extensions/logging-scribe/src/test/java/sample/LoggingTest.java b/sandbox/samples/temp/logging-scribe/src/test/java/sample/LoggingTest.java
index 4232365f81..4232365f81 100644
--- a/sandbox/samples/sca-extensions/logging-scribe/src/test/java/sample/LoggingTest.java
+++ b/sandbox/samples/temp/logging-scribe/src/test/java/sample/LoggingTest.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/README b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/README
index c416ad96a0..c416ad96a0 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/README
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/README
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/build.xml b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/build.xml
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/build.xml
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/pom.xml b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/pom.xml
index 6580790162..6580790162 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/pom.xml
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/pom.xml
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite
index c5e636f769..c5e636f769 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index d6a3ccb24e..d6a3ccb24e 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/README b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/README
index 4c67296bd4..4c67296bd4 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/README
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/README
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/pom.xml
index 5412ab75f7..5412ab75f7 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/pom.xml
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/pom.xml
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java
index 193a7d6636..193a7d6636 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java
index 2d14bbd49f..2d14bbd49f 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 55aabdb56f..55aabdb56f 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sandbox/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite
index c428ce93d6..c428ce93d6 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java
index 704101b5c0..704101b5c0 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/temp/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/sca-extensions/maven-osgi-junit/pom.xml b/sandbox/samples/temp/maven-osgi-junit/pom.xml
index b2e096c145..b2e096c145 100644
--- a/sandbox/samples/sca-extensions/maven-osgi-junit/pom.xml
+++ b/sandbox/samples/temp/maven-osgi-junit/pom.xml
diff --git a/sandbox/samples/sca-features/sca-client/calculator-scaclient/README b/sandbox/samples/temp/sca-client/calculator-scaclient/README
index 97058ca4c9..97058ca4c9 100644
--- a/sandbox/samples/sca-features/sca-client/calculator-scaclient/README
+++ b/sandbox/samples/temp/sca-client/calculator-scaclient/README
diff --git a/sandbox/samples/sca-features/sca-client/calculator-scaclient/pom.xml b/sandbox/samples/temp/sca-client/calculator-scaclient/pom.xml
index 6197b12e50..6197b12e50 100644
--- a/sandbox/samples/sca-features/sca-client/calculator-scaclient/pom.xml
+++ b/sandbox/samples/temp/sca-client/calculator-scaclient/pom.xml
diff --git a/sandbox/samples/sca-features/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java b/sandbox/samples/temp/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sandbox/samples/sca-features/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/temp/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/sca-features/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java b/sandbox/samples/temp/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
index edbf528517..edbf528517 100644
--- a/sandbox/samples/sca-features/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
+++ b/sandbox/samples/temp/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
diff --git a/sandbox/samples/sca-features/sca-client/pom.xml b/sandbox/samples/temp/sca-client/pom.xml
index 8a65e9f16d..8a65e9f16d 100644
--- a/sandbox/samples/sca-features/sca-client/pom.xml
+++ b/sandbox/samples/temp/sca-client/pom.xml