Moving 2.x branches

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

51 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/LICENSE
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 2345c785a7..2345c785a7 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/NOTICE
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index bf4ccc3d28..bf4ccc3d28 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index e3b690f24a..e3b690f24a 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index b939a5de80..b939a5de80 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index 2bf897d72a..2bf897d72a 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index 6f6f4bdce6..6f6f4bdce6 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c9fb3818b8..c9fb3818b8 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 4af00695da..4af00695da 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README
index 9e616c1f50..9e616c1f50 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/README
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/pom.xml
index bd3ae29be4..bd3ae29be4 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/pom.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index e0a6622136..e0a6622136 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index 028f860885..028f860885 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index e928317c2e..e928317c2e 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f9e606bd9a..f9e606bd9a 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 565670963f..565670963f 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index ed7083fb29..ed7083fb29 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index 332ba44396..332ba44396 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index faf61d11e4..faf61d11e4 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index bca04d11a4..bca04d11a4 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/LICENSE
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 4b7b7ec71b..4b7b7ec71b 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/NOTICE
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fe0bbf21df..fe0bbf21df 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 457588bfb6..457588bfb6 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 1a35665803..1a35665803 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 92b0ac7bf9..92b0ac7bf9 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index 7109300293..7109300293 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/README b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/README
index 374c0f0a8b..374c0f0a8b 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/README
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/dosgi-calculator.png
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/pom.xml
index 89d73ad449..89d73ad449 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/pom.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index 796b1afe61..796b1afe61 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index ac49cbcb12..ac49cbcb12 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 9c80c5beb9..9c80c5beb9 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 046e8cf565..046e8cf565 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 7d68dbd5c5..7d68dbd5c5 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 998f6e9554..998f6e9554 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index 7ed6db2e6b..7ed6db2e6b 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index cb98b8fb67..cb98b8fb67 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index 1a3e36f571..1a3e36f571 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index d573f6b8fa..d573f6b8fa 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index d735ce8172..d735ce8172 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index 8ba4b85247..8ba4b85247 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 7f96067764..7f96067764 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index d4bede0d98..d4bede0d98 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 958e744b41..958e744b41 100644
--- a/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java