123 files changed, 0 insertions, 132 deletions

diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/LICENSE
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/NOTICE
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c7250912b0..c7250912b0 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/README
index 57126842a4..57126842a4 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/README
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/README
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/pom.xml
index cf7faab1e8..cf7faab1e8 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/pom.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/pom.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/LICENSE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/LICENSE
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/NOTICE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/NOTICE
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 1dff21ab6b..1dff21ab6b 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
index c64e999fc6..c64e999fc6 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/README b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/README
index e2cf7cd522..e2cf7cd522 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/README
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/README
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/dosgi-calculator.png
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/pom.xml
index 2e06ff7e05..2e06ff7e05 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/pom.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/pom.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 2f37da0707..2f37da0707 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/LICENSE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/NOTICE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index 1965b571a9..1965b571a9 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/README
index 77a4cbae9e..77a4cbae9e 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/README
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/README
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
index 926208b388..926208b388 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f75cc6444e..f75cc6444e 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index eee64bf86f..eee64bf86f 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/LICENSE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/LICENSE
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/NOTICE
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/NOTICE
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ded82797b5..ded82797b5 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index f10b577e87..f10b577e87 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/README b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/README
index e8d311298e..e8d311298e 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/README
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/README
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/dosgi-calculator.png
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/pom.xml
index 0394373342..0394373342 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/pom.xml
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/pom.xml
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index aa09b27139..aa09b27139 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/sandbox/samples/temp/distributed-osgi/dynamic/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sandbox/samples/sca-extensions/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/README b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/README
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/README
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/build.xml b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/build.xml
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/build.xml
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/helloworld-ws-sdo.png b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/maven-eclipse.xml b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/maven-eclipse.xml
index 3adfca89f4..3adfca89f4 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/maven-eclipse.xml
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/maven-eclipse.xml
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/pom.xml b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/pom.xml
index c5bf5ff186..c5bf5ff186 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/pom.xml
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/pom.xml
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index ebc270811f..ebc270811f 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index ff5cb4ceda..ff5cb4ceda 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index fa257a0605..fa257a0605 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
index d222d77b3b..d222d77b3b 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
index a988a4156c..a988a4156c 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
index b609f58373..b609f58373 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
index f8b2a60f6a..f8b2a60f6a 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index 46c819d08c..46c819d08c 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index 65b0e294a8..65b0e294a8 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/logging.properties b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
index 0451cee24c..0451cee24c 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/test.xsd b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/test.xsd
index 7fd9aa0013..7fd9aa0013 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/test.xsd
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/test.xsd
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 882819110f..882819110f 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 3918f9a4a5..3918f9a4a5 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 98487ad88b..98487ad88b 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
index b6b4ed2254..b6b4ed2254 100644
--- a/sandbox/samples/temp/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
+++ b/sandbox/samples/sca-features/binding-ws/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
diff --git a/sandbox/samples/temp/distributed-osgi/dynamic/pom.xml b/sandbox/samples/temp/distributed-osgi/dynamic/pom.xml
deleted file mode 100644
index c3021a3cc5..0000000000
--- a/sandbox/samples/temp/distributed-osgi/dynamic/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-distributed-osgi-dynamic</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Distributed OSGI Dynamically Configured Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>dosgi-dynamic-calculator</module>
-                <module>dosgi-dynamic-calculator-operations</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/temp/distributed-osgi/implementation.osgi/pom.xml b/sandbox/samples/temp/distributed-osgi/implementation.osgi/pom.xml
deleted file mode 100644
index 56d975dea8..0000000000
--- a/sandbox/samples/temp/distributed-osgi/implementation.osgi/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-distributed-osgi-static</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Distributed OSGI Statically Configured Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>dosgi-calculator</module>
-                <module>dosgi-calculator-operations</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/temp/distributed-osgi/pom.xml b/sandbox/samples/temp/distributed-osgi/pom.xml
deleted file mode 100644
index 52fc787d75..0000000000
--- a/sandbox/samples/temp/distributed-osgi/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples-distributed-osgi</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Distributed OSGI Samples</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>implementation.osgi</module>
-                <module>dynamic</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>