Author: antelder
Date: Wed Nov 25 09:28:07 2009
New Revision: 884011
URL: http://svn.apache.org/viewvc?rev=884011&view=rev
Log:
Update the calculator sample to use the simplest createNode API as per the
ongoing dev list discussion
Modified:
tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
tuscany/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java?rev=884011&r1=884010&r2=884011&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
Wed Nov 25 09:28:07 2009
@@ -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 @@
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();
Modified:
tuscany/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java?rev=884011&r1=884010&r2=884011&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
Wed Nov 25 09:28:07 2009
@@ -20,9 +20,6 @@
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 @@
@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
