TUSCANY-3677 server side move of some sca feature samples (matching pom change to follow shortly)

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

71 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/samples/binding-rmi/README b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/README
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/README b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/README
index 2f169419ba..2f169419ba 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/README
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/build.xml
index fe28a46b7c..fe28a46b7c 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/build.xml
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/pom.xml
index c10d764ff1..c10d764ff1 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/README b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/README
index cb25027f14..cb25027f14 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/README
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/build.xml
index 888a1c88b7..888a1c88b7 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/build.xml
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/pom.xml
index 5cd39e96bb..5cd39e96bb 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sca-java-2.x/trunk/samples/binding-rmi/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/pom.xml
index 073687983d..073687983d 100644
--- a/sca-java-2.x/trunk/samples/binding-rmi/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-rmi/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-sca/README b/sca-java-2.x/trunk/samples/sca-features/binding-sca/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/README
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/README b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/README
index 4777c5ad88..4777c5ad88 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/build.xml
index c109d89c75..c109d89c75 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/pom.xml
index c877155853..c877155853 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/binding-sca/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-sca/pom.xml
index e3cc9d6e43..e3cc9d6e43 100644
--- a/sca-java-2.x/trunk/samples/binding-sca/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-sca/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-ws/README b/sca-java-2.x/trunk/samples/sca-features/binding-ws/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/README
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/README b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/README
index a1f34e0e8a..a1f34e0e8a 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/build.xml
index 69661f7b5e..69661f7b5e 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/calculator.odg b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/calculator.odg
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.odg
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/calculator.png b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/calculator.png
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/calculator.png
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/pom.xml
index a177a043d5..a177a043d5 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
index 138213b5fc..138213b5fc 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
index 3688ebcb85..3688ebcb85 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3a7548cd47..3a7548cd47 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws/pom.xml b/sca-java-2.x/trunk/samples/sca-features/binding-ws/pom.xml
index bfac74c8c0..bfac74c8c0 100644
--- a/sca-java-2.x/trunk/samples/binding-ws/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/binding-ws/pom.xml