Author: rfeng
Date: Tue Jan 13 16:31:58 2009
New Revision: 734282
URL: http://svn.apache.org/viewvc?rev=734282&view=rev
Log:
Bring up the RMI samples with 2.x
Modified:
tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
tuscany/java/sca/samples/calculator-rmi-service/pom.xml
tuscany/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
tuscany/java/sca/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
Modified: tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rmi-reference/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-rmi-reference/pom.xml Tue Jan 13
16:31:58 2009
@@ -28,19 +28,19 @@
<artifactId>sample-calculator-rmi-reference</artifactId>
<name>Apache Tuscany SCA Calculator RMI Reference Sample</name>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
Modified:
tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
---
tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
(original)
+++
tuscany/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
Tue Jan 13 16:31:58 2009
@@ -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 @@
*/
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();
}
Modified:
tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
---
tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
(original)
+++
tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
Tue Jan 13 16:31:58 2009
@@ -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>
Modified:
tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
---
tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
(original)
+++
tuscany/java/sca/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
Tue Jan 13 16:31:58 2009
@@ -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);
}
}
Modified: tuscany/java/sca/samples/calculator-rmi-service/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/pom.xml?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rmi-service/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-rmi-service/pom.xml Tue Jan 13 16:31:58
2009
@@ -28,18 +28,17 @@
<artifactId>sample-calculator-rmi-service</artifactId>
<name>Apache Tuscany SCA Calculator RMI Service Sample</name>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified:
tuscany/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
---
tuscany/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
(original)
+++
tuscany/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
Tue Jan 13 16:31:58 2009
@@ -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;
/**
* A claculator service server. Starts up the SCA runtime which
@@ -28,10 +31,13 @@
public class CalculatorServer {
public static void main(String[] args) throws Exception {
System.out.println("Starting of the SCA Calculator Application exposed
as RMI Services...");
- SCADomain scaDomain =
SCADomain.newInstance("CalculatorRMIServer.composite");
+ String uri =
ContributionLocationHelper.getContributionLocation("CalculatorRMIServer.composite");
+ Contribution contribution = new Contribution("c1", uri);
+ Node node =
NodeFactory.newInstance().createNode("CalculatorRMIServer.composite",
contribution);
+ node.start();
System.out.println("... Press Enter to Exit...");
System.in.read();
- scaDomain.close();
+ node.stop();
System.out.println("Exited...");
System.exit(0);
}
Modified:
tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
---
tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
(original)
+++
tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
Tue Jan 13 16:31:58 2009
@@ -27,7 +27,7 @@
<implementation.java class="calculator.CalculatorServiceImpl"/>
<service name="CalculatorService">
<interface.java interface="calculator.CalculatorService"/>
- <tuscany:binding.rmi host="localhost" port="8099"
serviceName="CalculatorRMIService"/>
+ <tuscany:binding.rmi
uri="rmi://localhost:8099/CalculatorRMIService"/>
</service>
<reference name="addService"
target="AddServiceComponent"></reference>
<reference name="subtractService"
target="SubtractServiceComponent"></reference>
Modified:
tuscany/java/sca/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java?rev=734282&r1=734281&r2=734282&view=diff
==============================================================================
---
tuscany/java/sca/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
(original)
+++
tuscany/java/sca/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
Tue Jan 13 16:31:58 2009
@@ -18,36 +18,46 @@
*/
package calculator;
-import java.rmi.Naming;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import java.rmi.Naming;
-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 CalculatorRMIServerTestCase extends TestCase {
+public class CalculatorRMIServerTestCase {
- private SCADomain scaDomain;
- private CalculatorService calculatorService;
+ private static Node node;
+ private static CalculatorService calculatorService;
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("CalculatorRMIServer.composite");
+ @BeforeClass
+ public static void setUp() throws Exception {
+ String uri =
ContributionLocationHelper.getContributionLocation("CalculatorRMIServer.composite");
+ Contribution contribution = new Contribution("c1", uri);
+ node =
NodeFactory.newInstance().createNode("CalculatorRMIServer.composite",
contribution);
+ node.start();
}
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ node.stop();
}
+ @Test
public void testCalculator() throws Exception {
// Calculate
calculatorService =
(CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService");
- 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);
}
}
