2 files changed, 4 insertions, 13 deletions
diff --git a/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
index b1855c45e2..3fb84d1a8e 100644
--- a/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
@@ -20,8 +20,6 @@
 package calculator;
 
 import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 
@@ -32,8 +30,7 @@ import org.apache.tuscany.sca.node.NodeFactory;
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        String contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
-        Node node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("calculator", contribution));
+        Node node = NodeFactory.newInstance().createNode(null, new String[] {"target/classes"}).start();
 
         node.start();
         
diff --git a/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 73c7d872b9..eaf56a1cfe 100644
--- a/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
@@ -20,9 +20,6 @@ package calculator;
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
@@ -39,12 +36,9 @@ public class CalculatorTestCase{
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-    	NodeFactory factory = NodeFactory.newInstance();
-        String contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
-        node = factory.createNode("Calculator.composite", new Contribution("calculator", contribution)).start();
-        // node = factory.createNode().start();
-
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        // ideally it would be: node = NodeFactory.newInstance().createNode("target/classes").start();
+        node = NodeFactory.newInstance().createNode(null, new String[] {"target/classes"}).start();
+        calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @AfterClass