53 files changed, 3 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
index 52fc787d75..fefbffb638 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml
@@ -36,8 +36,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>implementation.osgi</module>
-                <module>dynamic</module>
+                <module>dosgi-dynamic-calculator</module>
+                <module>dosgi-dynamic-calculator-operations</module>
             </modules>
         </profile>
     </profiles>    
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/LICENSE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/LICENSE
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/NOTICE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/NOTICE
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c7250912b0..c7250912b0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/README b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README
index 57126842a4..57126842a4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
index cf7faab1e8..cf7faab1e8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/LICENSE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/LICENSE
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/NOTICE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/NOTICE
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 1dff21ab6b..1dff21ab6b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
index c64e999fc6..c64e999fc6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/README b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/README
index e2cf7cd522..e2cf7cd522 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
index 2e06ff7e05..2e06ff7e05 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 2f37da0707..2f37da0707 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml
index 56d975dea8..56d975dea8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation.osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml
index c690b839f3..a18967ee4d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
@@ -47,6 +47,7 @@
                 <module>implementation-java</module>
                 <module>implementation-script</module>
                 <module>distributed-osgi</module>
+                <module>implementation-osgi</module>
                 <module>sca-client</module>
                 <module>async</module>
                 <module>maven-osgi-junit</module>