Fix package references to calculator.dosgi

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

3 files changed, 7 insertions, 10 deletions

diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceImpl.java b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
index f1f3409d1a..9f31afbd1f 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
@@ -48,7 +48,7 @@ public class CalculatorServiceImpl implements CalculatorService {
         super();
         Filter filter = null;
         try {
-            filter = context.createFilter("(" + Constants.OBJECTCLASS + "=calculator.operations.*)");
+            filter = context.createFilter("(" + Constants.OBJECTCLASS + "=calculator.dosgi.operations.*)");
         } catch (InvalidSyntaxException e) {
             e.printStackTrace();
         }
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 180fd58046..8b4d16f783 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
@@ -27,7 +27,6 @@ import java.net.URL;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleActivator;
 import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
 import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;
 import org.apache.tuscany.sca.node.osgi.impl.NodeImpl;
@@ -72,7 +71,7 @@ public class CalculatorOSGiNodeTestCase {
         }
         
         bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar",
-                                                 "calculator/META-INF/MANIFEST.MF",
+                                                 "calculator/dosgi/META-INF/MANIFEST.MF",
                                                  new String[] {"OSGI-INF/calculator-component.xml",
                                                                "OSGI-INF/sca/bundle.componentType",
                                                                "calculator/calculator.composite"},
@@ -82,7 +81,7 @@ public class CalculatorOSGiNodeTestCase {
                                                  CalculatorActivator.class));
 
         bundles.add(OSGiTestBundles.createBundle("target/test-classes/operations-bundle.jar",
-                                                 "calculator/operations/META-INF/MANIFEST.MF",
+                                                 "calculator/dosgi/operations/META-INF/MANIFEST.MF",
                                                  new String[] {"OSGI-INF/add-component.xml",
                                                                "OSGI-INF/subtract-component.xml",
                                                                "OSGI-INF/multiply-component.xml",
@@ -106,10 +105,8 @@ public class CalculatorOSGiNodeTestCase {
                 }
             }
             for (Bundle b : context.getBundles()) {
-                if (b.getSymbolicName().equals("calculator")) {
+                if (b.getSymbolicName().equals("calculator.dosgi")) {
                     b.start();
-                    // HACK
-                    OSGiBundleActivator.setBundleContext(b.getBundleContext());
                     NodeImpl node = new NodeImpl(b);
                     node.start();
                     System.out.println(string(b, false));
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
index 0523b74403..d3d67d72b8 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
@@ -71,7 +71,7 @@ public class CalculatorOSGiTestCase {
         }
 
         bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar",
-                                                 "calculator/META-INF/MANIFEST.MF",
+                                                 "calculator/dosgi/META-INF/MANIFEST.MF",
                                                  new String[] {"OSGI-INF/calculator-component.xml"},
                                                  CalculatorService.class,
                                                  CalculatorServiceImpl.class,
@@ -79,7 +79,7 @@ public class CalculatorOSGiTestCase {
                                                  CalculatorActivator.class));
 
         bundles.add(OSGiTestBundles.createBundle("target/test-classes/operations-bundle.jar",
-                                                 "calculator/operations/META-INF/MANIFEST.MF",
+                                                 "calculator/dosgi/operations/META-INF/MANIFEST.MF",
                                                  new String[] {"OSGI-INF/add-component.xml",
                                                                "OSGI-INF/subtract-component.xml",
                                                                "OSGI-INF/multiply-component.xml",
@@ -103,7 +103,7 @@ public class CalculatorOSGiTestCase {
                 }
             }
             for (Bundle b : context.getBundles()) {
-                if (b.getSymbolicName().startsWith("calculator")) {
+                if (b.getSymbolicName().startsWith("calculator.dosgi")) {
                     b.start();
                     System.out.println(string(b, false));
                 }