84 files changed, 0 insertions, 89 deletions
diff --git a/sandbox/samples/temp/binding-comet/deploy.sh b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/deploy.sh
index eb53bd5c76..eb53bd5c76 100755
--- a/sandbox/samples/temp/binding-comet/deploy.sh
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/deploy.sh
diff --git a/sandbox/samples/temp/binding-comet/pom.xml b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/pom.xml
index 5f28205da4..5f28205da4 100644
--- a/sandbox/samples/temp/binding-comet/pom.xml
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/pom.xml
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
index eecc6044ea..eecc6044ea 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
index 00cbe73e82..00cbe73e82 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
index afbdcbc8d7..afbdcbc8d7 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
index 4278ef975b..4278ef975b 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 55f935fa9f..55f935fa9f 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
index 092988213b..092988213b 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
index ff2da3a360..ff2da3a360 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
index aaa23f0b8a..aaa23f0b8a 100644
--- a/sandbox/samples/temp/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
diff --git a/sandbox/samples/temp/binding-comet/src/main/webapp/META-INF/MANIFEST.MF b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sandbox/samples/temp/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml
index 8696f76c50..8696f76c50 100644
--- a/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite
index 05b2ddd0d7..05b2ddd0d7 100644
--- a/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sandbox/samples/temp/binding-comet/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/temp/binding-comet/src/main/webapp/index.html b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/index.html
index 0387e67adb..0387e67adb 100644
--- a/sandbox/samples/temp/binding-comet/src/main/webapp/index.html
+++ b/sandbox/samples/sca-extensions/binding-comet/weather-webapp/src/main/webapp/index.html
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/README b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/README
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/README
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/build.xml b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/build.xml
index 7d0ce122dd..7d0ce122dd 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/build.xml
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/build.xml
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/pom.xml b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/pom.xml
index 7e08ce52be..7e08ce52be 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/pom.xml
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/pom.xml
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java
index bb39e961b4..bb39e961b4 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index 8eabfa6773..8eabfa6773 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite
index 5f1add2431..5f1add2431 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/build-dojo.xml
index 36714c67fc..36714c67fc 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/build-dojo.xml
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/pom.xml b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/pom.xml
index 586937b5e5..586937b5e5 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/pom.xml
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/pom.xml
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java
index 71724ee7ae..71724ee7ae 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e16b352021..e16b352021 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite
index dc0df8756c..dc0df8756c 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b7e216baf7..b7e216baf7 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html
index 6d22806e8f..6d22806e8f 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html
diff --git a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sandbox/samples/temp/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/sca-extensions/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/README b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/README
index 2f169419ba..2f169419ba 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/README
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/README
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/build.xml b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/build.xml
index fe28a46b7c..fe28a46b7c 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/build.xml
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/pom.xml b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/pom.xml
index c10d764ff1..c10d764ff1 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/pom.xml
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/README b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/README
index cb25027f14..cb25027f14 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/README
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/README
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/build.xml b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/build.xml
index 888a1c88b7..888a1c88b7 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/build.xml
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/build.xml
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/pom.xml b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/pom.xml
index 5cd39e96bb..5cd39e96bb 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/pom.xml
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sandbox/samples/temp/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sandbox/samples/sca-extensions/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sandbox/samples/temp/binding-jsonrpc/README b/sandbox/samples/temp/binding-jsonrpc/README
deleted file mode 100644
index 18ba62d494..0000000000
--- a/sandbox/samples/temp/binding-jsonrpc/README
+++ /dev/null
@@ -1 +0,0 @@
-Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sandbox/samples/temp/binding-jsonrpc/pom.xml b/sandbox/samples/temp/binding-jsonrpc/pom.xml
deleted file mode 100644
index 52d05e075b..0000000000
--- a/sandbox/samples/temp/binding-jsonrpc/pom.xml
+++ /dev/null
@@ -1,43 +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-sample-binding-jsonrpc</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Sample binding.jsonrpc</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>contribution-calculator</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/temp/binding-rmi/README b/sandbox/samples/temp/binding-rmi/README
deleted file mode 100644
index 18ba62d494..0000000000
--- a/sandbox/samples/temp/binding-rmi/README
+++ /dev/null
@@ -1 +0,0 @@
-Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sandbox/samples/temp/binding-rmi/pom.xml b/sandbox/samples/temp/binding-rmi/pom.xml
deleted file mode 100644
index 073687983d..0000000000
--- a/sandbox/samples/temp/binding-rmi/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-sample-binding-rmi</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Sample binding.rmi</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>contribution-calculator-reference</module>
-                <module>contribution-calculator-service</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>