20 files changed, 86 insertions, 76 deletions
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
index b2d8ffb44c..cf1b78931a 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package calculator.dosgi;
+package calculator.dosgi.impl;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -29,6 +29,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
 
+import calculator.dosgi.CalculatorService;
 import calculator.dosgi.operations.AddService;
 
 /**
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 9a1d64077b..5f9db16ca9 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package calculator.dosgi;
+package calculator.dosgi.impl;
 
 import org.osgi.service.component.ComponentContext;
 
+import calculator.dosgi.CalculatorService;
 import calculator.dosgi.operations.AddService;
 import calculator.dosgi.operations.DivideService;
 import calculator.dosgi.operations.MultiplyService;
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 1634a1f2a4..0960938086 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package calculator.dosgi;
+package calculator.dosgi.impl;
 
 import static org.osgi.framework.Constants.OBJECTCLASS;
 
@@ -25,6 +25,7 @@ import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.util.tracker.ServiceTracker;
 
+import calculator.dosgi.CalculatorService;
 import calculator.dosgi.operations.AddService;
 import calculator.dosgi.operations.DivideService;
 import calculator.dosgi.operations.MultiplyService;
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 6bdbfa5fb5..66b2977241 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package calculator.dosgi.operations;
+package calculator.dosgi.operations.impl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import calculator.dosgi.operations.AddService;
+
 /**
  * An implementation of the Add service
  */
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index eafc9b0f4f..a3c21b2b96 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package calculator.dosgi.operations;
+package calculator.dosgi.operations.impl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import calculator.dosgi.operations.DivideService;
+
 /**
  * An implementation of the Divide service.
  */
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index c2e39ad2f4..7922d2d392 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package calculator.dosgi.operations;
+package calculator.dosgi.operations.impl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import calculator.dosgi.operations.MultiplyService;
+
 /**
  * An implementation of the Multiply service.
  */
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
index 7db89cd98d..afc1ff4c1c 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package calculator.dosgi.operations;
+package calculator.dosgi.operations.impl;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -26,6 +26,11 @@ import java.util.logging.Logger;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
+import calculator.dosgi.operations.AddService;
+import calculator.dosgi.operations.DivideService;
+import calculator.dosgi.operations.MultiplyService;
+import calculator.dosgi.operations.SubtractService;
+
 /**
  * 
  */
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 64cc776884..4bbe83b14f 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package calculator.dosgi.operations;
+package calculator.dosgi.operations.impl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import calculator.dosgi.operations.SubtractService;
+
 /**
  * An implementation of the subtract service.
  */
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 06ad78d7a5..6c4b9b95b1 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
@@ -6,28 +6,26 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package calculator.dosgi.test;
 
+import static calculator.dosgi.test.OSGiTestBundles.bundleStatus;
 import static calculator.dosgi.test.OSGiTestBundles.generateCalculatorBundle;
 import static calculator.dosgi.test.OSGiTestBundles.generateOperationsBundle;
-import static calculator.dosgi.test.OSGiTestBundles.bundleStatus;
 
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;
 import org.junit.AfterClass;
@@ -41,11 +39,13 @@ import org.osgi.framework.ServiceReference;
 import calculator.dosgi.CalculatorService;
 
 /**
- * 
+ *
  */
 public class CalculatorOSGiNodeTestCase {
     private static EquinoxHost host;
     private static BundleContext context;
+    private static Bundle calculatorBundle;
+    private static Bundle operationsBundle;
     private static Boolean client;
 
     public static URL getCodeLocation(final Class<?> anchorClass) {
@@ -62,26 +62,23 @@ public class CalculatorOSGiNodeTestCase {
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         try {
+            host = new EquinoxHost();
+            context = host.start();
             String prop = System.getProperty("client");
             if (prop != null) {
                 client = Boolean.valueOf(prop);
             }
-            Set<URL> bundles = new HashSet<URL>();
 
             if (client == null || client.booleanValue()) {
                 System.out.println("Generating calculator.dosgi bundle...");
-                bundles.add(generateCalculatorBundle());
+                calculatorBundle = context.installBundle(generateCalculatorBundle().toString());
             }
 
             if (client == null || !client.booleanValue()) {
                 System.out.println("Generating calculator.dosgi.operations bundle...");
-                bundles.add(generateOperationsBundle());
-            }
-            host = new EquinoxHost();
-            context = host.start();
-            for (URL loc : bundles) {
-                host.installBundle(loc, null);
+                operationsBundle = context.installBundle(generateOperationsBundle().toString());
             }
+
             for (Bundle b : context.getBundles()) {
                 if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName()
                     .startsWith("org.apache.tuscany.sca.")) {
@@ -94,12 +91,17 @@ public class CalculatorOSGiNodeTestCase {
                     System.out.println(bundleStatus(b, false));
                 }
             }
-            for (Bundle b : context.getBundles()) {
-                if (b.getSymbolicName().startsWith("calculator.dosgi")) {
-                    b.start();
-                    System.out.println(bundleStatus(b, false));
-                }
+
+            if (calculatorBundle != null) {
+                calculatorBundle.start();
+                System.out.println(bundleStatus(calculatorBundle, false));
             }
+
+            if (operationsBundle != null) {
+                operationsBundle.start();
+                System.out.println(bundleStatus(operationsBundle, false));
+            }
+
         } catch (Exception e) {
             e.printStackTrace();
             throw e;
@@ -109,7 +111,7 @@ public class CalculatorOSGiNodeTestCase {
     @Test
     public void testOSGi() {
         if (client == null || client.booleanValue()) {
-            ServiceReference ref = context.getServiceReference(CalculatorService.class.getName());
+            ServiceReference ref = calculatorBundle.getBundleContext().getServiceReference(CalculatorService.class.getName());
             Assert.assertNotNull(ref);
             Object service = context.getService(ref);
             Assert.assertNotNull(service);
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
index c77aa8e569..3937ac0974 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
@@ -6,24 +6,22 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package calculator.dosgi.test;
 
 import static calculator.dosgi.test.OSGiTestBundles.bundleStatus;
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
+import static calculator.dosgi.test.OSGiTestBundles.generateCalculatorBundle;
+import static calculator.dosgi.test.OSGiTestBundles.generateOperationsBundle;
 
 import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;
 import org.junit.AfterClass;
@@ -36,7 +34,7 @@ import org.osgi.framework.ServiceReference;
 import calculator.dosgi.CalculatorService;
 
 /**
- * 
+ *
  */
 public class CalculatorOSGiTestCase {
     private static EquinoxHost host;
@@ -46,17 +44,12 @@ public class CalculatorOSGiTestCase {
      */
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-        Set<URL> bundles = new HashSet<URL>();
-
-        bundles.add(OSGiTestBundles.generateCalculatorBundle());
-
-        bundles.add(OSGiTestBundles.generateOperationsBundle());
         try {
             host = new EquinoxHost();
             BundleContext context = host.start();
-            for (URL loc : bundles) {
-                host.installBundle(loc, null);
-            }
+            Bundle calculatorBundle = context.installBundle(generateCalculatorBundle().toString());
+            Bundle operationsBundle = context.installBundle(generateOperationsBundle().toString());
+
             for (Bundle b : context.getBundles()) {
                 if (b.getSymbolicName().equals("org.eclipse.equinox.ds")) {
                     System.out.println(bundleStatus(b, false));
@@ -64,19 +57,19 @@ public class CalculatorOSGiTestCase {
                     System.out.println(bundleStatus(b, false));
                 }
             }
-            for (Bundle b : context.getBundles()) {
-                if (b.getSymbolicName().startsWith("calculator.dosgi")) {
-                    b.start();
-                    System.out.println(bundleStatus(b, false));
-                }
-            }
+
+            calculatorBundle.start();
+            System.out.println(bundleStatus(calculatorBundle, false));
+            operationsBundle.start();
+            System.out.println(bundleStatus(operationsBundle, false));
 
             // Sleep for 1 sec so that the DS is available
             Thread.sleep(1000);
             // Use the DS version
             String filter = "(component.name=CalculatorComponent)";
             System.out.println(filter);
-            ServiceReference ref = context.getServiceReferences(CalculatorService.class.getName(), filter)[0];
+            ServiceReference ref =
+                calculatorBundle.getBundleContext().getServiceReferences(CalculatorService.class.getName(), filter)[0];
             CalculatorService calculator = OSGiTestBundles.cast(context.getService(ref), CalculatorService.class);
             System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0));
             System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0));
diff --git a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
index 69ae4cada2..0e299938a1 100644
--- a/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
@@ -40,19 +40,19 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.Constants;
 
-import calculator.dosgi.CalculatorActivator;
 import calculator.dosgi.CalculatorService;
-import calculator.dosgi.CalculatorServiceDSImpl;
-import calculator.dosgi.CalculatorServiceImpl;
+import calculator.dosgi.impl.CalculatorActivator;
+import calculator.dosgi.impl.CalculatorServiceDSImpl;
+import calculator.dosgi.impl.CalculatorServiceImpl;
 import calculator.dosgi.operations.AddService;
-import calculator.dosgi.operations.AddServiceImpl;
 import calculator.dosgi.operations.DivideService;
-import calculator.dosgi.operations.DivideServiceImpl;
 import calculator.dosgi.operations.MultiplyService;
-import calculator.dosgi.operations.MultiplyServiceImpl;
-import calculator.dosgi.operations.OperationsActivator;
 import calculator.dosgi.operations.SubtractService;
-import calculator.dosgi.operations.SubtractServiceImpl;
+import calculator.dosgi.operations.impl.AddServiceImpl;
+import calculator.dosgi.operations.impl.DivideServiceImpl;
+import calculator.dosgi.operations.impl.MultiplyServiceImpl;
+import calculator.dosgi.operations.impl.OperationsActivator;
+import calculator.dosgi.operations.impl.SubtractServiceImpl;
 
 /**
  *
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
index 41c1264364..0aa9cf047e 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
@@ -3,13 +3,12 @@ Export-Package: calculator.dosgi;version="1.0.0",
  calculator.dosgi.operations;version="1.0.0"
 Bundle-Version: 1.0.0
 Bundle-Name: calculator.dosgi
-Bundle-Activator: calculator.dosgi.CalculatorActivator
+Bundle-Activator: calculator.dosgi.impl.CalculatorActivator
 Bundle-ManifestVersion: 2
-Import-Package: calculator.dosgi.operations;version="1.0.0",
- org.osgi.framework,
+Import-Package: org.osgi.framework,
+ org.osgi.service.component;resolution:=optional,
  org.osgi.service.packageadmin,
- org.osgi.util.tracker,
- org.osgi.service.component;resolution:=optional
+ org.osgi.util.tracker
 Bundle-SymbolicName: calculator.dosgi
 Bundle-Vendor: The Apache Software Foundation
 Bundle-ActivationPolicy: lazy
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
index c61fc295a6..fd834e12ef 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
@@ -19,7 +19,7 @@
 -->
 <!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) -->
 <components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <component id="CalculatorComponent" class="calculator.dosgi.CalculatorServiceImpl">
+    <component id="CalculatorComponent" class="calculator.dosgi.impl.CalculatorServiceImpl">
         <property name="addService" ref="AddService" />
         <property name="subtractService" ref="SubtractService" />
         <property name="multiplyService" ref="MultiplyService" />
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
index 3e537df732..5daaa59aae 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
@@ -19,7 +19,7 @@
 -->
 <scr:component name="CalculatorComponent" 
                xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.CalculatorServiceDSImpl" />
+    <implementation class="calculator.dosgi.impl.CalculatorServiceDSImpl" />
     <service>
         <provide interface="calculator.dosgi.CalculatorService" />
     </service>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
index eb15e778b1..ccdb755d56 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: calculator.dosgi.operations;version="1.0.0"
 Bundle-Version: 1.0.0
 Bundle-Name: calculator.dosgi.operations
-Bundle-Activator: calculator.dosgi.operations.OperationsActivator
+Bundle-Activator: calculator.dosgi.operations.impl.OperationsActivator
 Bundle-ManifestVersion: 2
 Import-Package: calculator.dosgi.operations;version="1.0.0",
  org.osgi.framework,
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
index a7d563023c..99845257ff 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <scr:component name="AddComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.AddServiceImpl" />
+    <implementation class="calculator.dosgi.operations.impl.AddServiceImpl" />
     <service>
         <provide interface="calculator.dosgi.operations.AddService" />
     </service>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
index 6410b55129..f6b5f4690e 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
@@ -19,13 +19,13 @@
 -->
 <!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) -->
 <components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <component id="AddComponent" class="calculator.dosgi.operations.AddServiceImpl">
+    <component id="AddComponent" class="calculator.dosgi.operations.impl.AddServiceImpl">
     </component>
-    <component id="SubtractComponent" class="calculator.dosgi.operations.SubtractServiceImpl">
+    <component id="SubtractComponent" class="calculator.dosgi.operations.impl.SubtractServiceImpl">
     </component>
-    <component id="MultiplyComponent" class="calculator.dosgi.operations.MultiplyServiceImpl">
+    <component id="MultiplyComponent" class="calculator.dosgi.operations.impl.MultiplyServiceImpl">
     </component>
-    <component id="DivideComponent" class="calculator.dosgi.operations.DivideServiceImpl">
+    <component id="DivideComponent" class="calculator.dosgi.operations.impl.DivideServiceImpl">
     </component>
 
     <!-- We can derive the SCA services for the implementation.osgi -->
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
index def7fce23c..322d4daf2f 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <scr:component name="DivideComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.DivideServiceImpl" />
+    <implementation class="calculator.dosgi.operations.impl.DivideServiceImpl" />
     <service>
         <provide interface="calculator.dosgi.operations.DivideService" />
     </service>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
index 57f627f990..b9ca777bd8 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <scr:component name="MultiplyComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.MultiplyServiceImpl" />
+    <implementation class="calculator.dosgi.operations.impl.MultiplyServiceImpl" />
     <service>
         <provide interface="calculator.dosgi.operations.MultiplyService" />
     </service>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
index 073ee5ea40..1472f5a976 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <scr:component name="SubtractComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="calculator.dosgi.operations.SubtractServiceImpl" />
+    <implementation class="calculator.dosgi.operations.impl.SubtractServiceImpl" />
     <service>
         <provide interface="calculator.dosgi.operations.SubtractService" />
     </service>