TUSCANY-3677 more samples reorg

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997803 13f79535-47bb-0310-9956-ffa450edef68

53 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/samples/binding-comet/deploy.sh b/sca-java-2.x/trunk/samples/sca-features/binding-comet/deploy.sh
index eb53bd5c76..eb53bd5c76 100755
--- a/sca-java-2.x/trunk/samples/binding-comet/deploy.sh
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/deploy.sh
diff --git a/sca-java-2.x/trunk/samples/binding-comet/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-comet/pom.xml
index 5f28205da4..5f28205da4 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
index eecc6044ea..eecc6044ea 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
index 00cbe73e82..00cbe73e82 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
index afbdcbc8d7..afbdcbc8d7 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
index 4278ef975b..4278ef975b 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 55f935fa9f..55f935fa9f 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
index 092988213b..092988213b 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
index ff2da3a360..ff2da3a360 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
index aaa23f0b8a..aaa23f0b8a 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
index e3979a7001..e3979a7001 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.composite
index 05b2ddd0d7..05b2ddd0d7 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/index.html
index 0387e67adb..0387e67adb 100644
--- a/sca-java-2.x/trunk/samples/binding-comet/src/main/webapp/index.html
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-comet/src/main/webapp/index.html
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/README b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/README
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
index 36714c67fc..36714c67fc 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/pom.xml
index 586937b5e5..586937b5e5 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
index 71724ee7ae..71724ee7ae 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e16b352021..e16b352021 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
index dc0df8756c..dc0df8756c 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b7e216baf7..b7e216baf7 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
index 6d22806e8f..6d22806e8f 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/README b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/build.xml
index 7d0ce122dd..7d0ce122dd 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/pom.xml
index 7e08ce52be..7e08ce52be 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
index bb39e961b4..bb39e961b4 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index 8eabfa6773..8eabfa6773 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
index 5f1add2431..5f1add2431 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/pom.xml
index 52d05e075b..52d05e075b 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-jsonrpc/pom.xml