diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-14 00:31:58 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-14 00:31:58 +0000 |
commit | e0f38b2db6826c17d8e722939037261270f5bcd8 (patch) | |
tree | 6e1a4c31e60bd8a0b514ba8c45d8765823316036 /java/sca/samples/calculator-rmi-reference/src | |
parent | 45d5073d1ab854cdc6174e48c7ce818964a63c08 (diff) |
Bring up the RMI samples with 2.x
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@734282 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
3 files changed, 42 insertions, 27 deletions
diff --git a/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java index cd1076c3f1..3ee36be233 100644 --- a/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java @@ -19,7 +19,10 @@ package calculator;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
/**
* This client program shows how to create an SCA runtime, start it,
@@ -27,17 +30,19 @@ import org.apache.tuscany.sca.host.embedded.SCADomain; */
public class CalculatorClient {
public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");
- CalculatorService calculatorService =
- scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+ String uri = ContributionLocationHelper.getContributionLocation("CalculatorRMIReference.composite");
+ Contribution contribution = new Contribution("c1", uri);
+ Node node = NodeFactory.newInstance().createNode("CalculatorRMIReference.composite", contribution);
+ node.start();
+ CalculatorService calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent");
// Calculate
System.out.println("3 + 2=" + calculatorService.add(3, 2));
System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
- scaDomain.close();
+
+ node.stop();
}
diff --git a/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite index a5a6e1cd29..17341b2a59 100644 --- a/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite +++ b/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite @@ -26,16 +26,16 @@ <component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService"> - <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/> + <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> </reference>
<reference name="subtractService"> - <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/> + <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> </reference>
<reference name="multiplyService"> - <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/> + <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> </reference>
<reference name="divideService"> - <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/> + <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> </reference>
</component>
diff --git a/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java index 15e00f5946..f14191c411 100644 --- a/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java +++ b/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java @@ -18,43 +18,53 @@ */
package calculator;
+import static org.junit.Assert.assertEquals;
+
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
* This shows how to test the Calculator service component.
*/
-public class CalculatorRMIReferenceTestCase extends TestCase {
+public class CalculatorRMIReferenceTestCase {
- private SCADomain scaDomain;
- private CalculatorService calculatorService;
+ private static Node node;
+ private static CalculatorService calculatorService;
- @Override
- protected void setUp() throws Exception {
+ @BeforeClass
+ public static void setUp() throws Exception {
CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl();
Registry rmiRegistry = LocateRegistry.createRegistry(8099);
rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl);
- scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");
- calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+ String uri = ContributionLocationHelper.getContributionLocation("CalculatorRMIReference.composite");
+ Contribution contribution = new Contribution("c1", uri);
+ node = NodeFactory.newInstance().createNode("CalculatorRMIReference.composite", contribution);
+ node.start();
+ calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent");
}
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
+ @AfterClass
+ public static void tearDown() throws Exception {
+ node.stop();
LocateRegistry.getRegistry(8099).unbind("CalculatorRMIService");
}
+ @Test
public void testCalculator() throws Exception {
// Calculate
- assertEquals(calculatorService.add(3, 2), 5.0);
- assertEquals(calculatorService.subtract(3, 2), 1.0);
- assertEquals(calculatorService.multiply(3, 2), 6.0);
- assertEquals(calculatorService.divide(3, 2), 1.5);
+ assertEquals(calculatorService.add(3, 2), 5.0, 0.0);
+ assertEquals(calculatorService.subtract(3, 2), 1.0, 0.0);
+ assertEquals(calculatorService.multiply(3, 2), 6.0, 0.0);
+ assertEquals(calculatorService.divide(3, 2), 1.5, 0.0);
}
}
|