Rationalized how to locate an SCA contribution given a known Java class contained in that contribution, and how to locate an SCA contribution represented by an OSGi bundle.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index 19d4ed5a04..c3122cca7c 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
@@ -18,10 +18,9 @@
  */
 package calculator.rcp;
 
-import java.io.File;
-
 import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
+import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -49,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
         plugin = this;
         
         launcher = NodeLauncher.newInstance();
-        String location = getClass().getProtectionDomain().getCodeSource().getLocation().toString();
+        String location = ContributionLocationHelper.getContributionLocation(getClass());
         node = launcher.createNode("Calculator.composite", new Contribution("c1", location));
         node.start();
     }