66 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
index 6bcb1e62ad..6bcb1e62ad 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html
index f8b33b440d..f8b33b440d 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java
index 39e9be92e6..39e9be92e6 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java
index d17650ec3f..d17650ec3f 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
index 0953eae036..0953eae036 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
index 6363068cfd..6363068cfd 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java
index 7276bb6964..7276bb6964 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java
index 3c3388f4cd..3c3388f4cd 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
index c02c284007..c02c284007 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/client/CalculatorClient.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
index ef36007eb6..ef36007eb6 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
index b1aba993a7..b1aba993a7 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SciCalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
index d9027b5616..d9027b5616 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/java/calculator/sci/SqrtService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
index 73c0fb48cf..73c0fb48cf 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
index d753a66774..d753a66774 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/META-INF/sca/sci_calc.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType
index 1880164f29..1880164f29 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.componentType
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js
index b0e2ef81d4..b0e2ef81d4 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/Sqrt.js
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType
index 94bd4549d6..94bd4549d6 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.componentType
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb
index 1f949e933e..1f949e933e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/SubtractImpl.rb
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl
index 46928e7055..46928e7055 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/main/resources/wsdl/calculator.wsdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
index 61a9f0f699..61a9f0f699 100644
--- a/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator-combo/src/test/java/calculator/CalculatorTestClient.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculator/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/pom.xml
index 4efd818037..4efd818037 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/calculator/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/readme.html
index 5d4e2cfcfb..5d4e2cfcfb 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
index da6a530052..da6a530052 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
index cb4edeac7e..cb4edeac7e 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index efb49ead63..efb49ead63 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
index 535298d31d..535298d31d 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index e1d491beee..e1d491beee 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 053f323627..053f323627 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
index 3ac67d4b44..3ac67d4b44 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java
index f33d7abb02..f33d7abb02 100644
--- a/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt
index bdec70a4fa..bdec70a4fa 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt
index 4dbc3a8099..4dbc3a8099 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/NOTICE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml
index 97176810dc..97176810dc 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/pom.xml
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html
index bebe69ec8b..bebe69ec8b 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/readme.html
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java
index 39e9be92e6..39e9be92e6 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java
index f1185a2494..f1185a2494 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java
index d72c0d30c3..d72c0d30c3 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java
index 159ca463c9..159ca463c9 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java
index 42e8e5ca67..42e8e5ca67 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java
index 76caace7bb..76caace7bb 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MathServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java
index 2c9053f61a..2c9053f61a 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java
index 3c3388f4cd..3c3388f4cd 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java
index 3608d6b92a..3608d6b92a 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/java/calculator/server/CalculatorRMIServer.java
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE
index 11c564eb19..11c564eb19 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
index bc12412818..bc12412818 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
index 0f3408129a..0f3408129a 100644
--- a/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java
+++ b/sca-java-1.x/branches/sca-java-M2/samples/standalone/calculatorRMIService/src/test/java/calculator/server/CalculatorRMITestServer.java