diff options
Diffstat (limited to 'branches/sca-equinox/samples')
2 files changed, 6 insertions, 4 deletions
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java index dc0da7d20d..706293f262 100644 --- a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java +++ b/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java @@ -21,6 +21,8 @@ package calculator; import junit.framework.TestCase; 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.osoa.sca.annotations.EagerInit; import org.osoa.sca.annotations.Scope; @@ -38,7 +40,8 @@ public class CalculatorTestCase extends TestCase { @Override protected void setUp() throws Exception { launcher = NodeLauncher.newInstance(); - node = launcher.createNodeFromClassLoader("Calculator.composite", getClass().getClassLoader()); + String location = ContributionLocationHelper.getContributionLocation(getClass()); + node = launcher.createNode("Calculator.composite", new Contribution("test", location)); System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); node.start(); } 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(); } |