95 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/README
index f7c47328fa..f7c47328fa 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml
index 30817fe6f0..30817fe6f0 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml
index c82c23cddd..c82c23cddd 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 08cba76467..08cba76467 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index 20dce0ec28..20dce0ec28 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 554872a8b0..554872a8b0 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/README
index 016ebf5668..016ebf5668 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml
index 280f6e03ce..280f6e03ce 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index f603f914b8..f603f914b8 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 978d2c6f42..978d2c6f42 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 85e2dc4135..85e2dc4135 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 67300bd99e..67300bd99e 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/README
index ce471ebddc..ce471ebddc 100644
--- a/branches/sca-java-0.90/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/README
diff --git a/branches/sca-java-0.90/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-0.90/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-0.90/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-0.90/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/pom.xml
index d86c5c8ce4..d86c5c8ce4 100644
--- a/branches/sca-java-0.90/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite
index fce26f940f..fce26f940f 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType
index 8746c26a76..8746c26a76 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType
index 76798fab3c..76798fab3c 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 34c50c7aa5..34c50c7aa5 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType
index 0edf77d4fd..0edf77d4fd 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index c174cf7ed9..c174cf7ed9 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/README
index 28f1f80abb..28f1f80abb 100644
--- a/branches/sca-java-0.90/samples/calculator-web/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/README
diff --git a/branches/sca-java-0.90/samples/calculator-web/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/build.xml
index aa826ef036..aa826ef036 100644
--- a/branches/sca-java-0.90/samples/calculator-web/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/calculator-web.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-0.90/samples/calculator-web/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.png
diff --git a/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg
diff --git a/branches/sca-java-0.90/samples/calculator-web/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/pom.xml
index 7a5ea1dd2d..7a5ea1dd2d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite
index 785984fd55..785984fd55 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
index 048c4c125c..048c4c125c 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml
index e596b2bc39..e596b2bc39 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp
index 375116e5de..375116e5de 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java
index 65b8646d4d..65b8646d4d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/README
index fbc79e0383..fbc79e0383 100644
--- a/branches/sca-java-0.90/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/README
diff --git a/branches/sca-java-0.90/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-0.90/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-0.90/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.png
diff --git a/branches/sca-java-0.90/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-0.90/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.svg
diff --git a/branches/sca-java-0.90/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/pom.xml
index 066b6ed3cb..066b6ed3cb 100644
--- a/branches/sca-java-0.90/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite
index f8655c04fa..f8655c04fa 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 8da7097149..8da7097149 100644
--- a/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java