You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/05/29 21:49:01 UTC
svn commit: r542636 - in
/incubator/tuscany/sandbox/slaws/calculator-distributed: ./
src/main/java/calculator/ src/main/resources/ src/test/java/calculator/
Author: slaws
Date: Tue May 29 12:49:00 2007
New Revision: 542636
URL: http://svn.apache.org/viewvc?view=rev&rev=542636
Log:
distributed runtime testing
Modified:
incubator/tuscany/sandbox/slaws/calculator-distributed/build.xml
incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientA.java
incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientB.java
incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/resources/Calculator.composite
incubator/tuscany/sandbox/slaws/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java
Modified: incubator/tuscany/sandbox/slaws/calculator-distributed/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/calculator-distributed/build.xml?view=diff&rev=542636&r1=542635&r2=542636
==============================================================================
--- incubator/tuscany/sandbox/slaws/calculator-distributed/build.xml (original)
+++ incubator/tuscany/sandbox/slaws/calculator-distributed/build.xml Tue May 29 12:49:00 2007
@@ -52,6 +52,8 @@
<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-contribution/1.0-incubating-SNAPSHOT/tuscany-contribution-1.0-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-databinding/1.0-incubating-SNAPSHOT/tuscany-databinding-1.0-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-host-embedded/1.0-incubating-SNAPSHOT/tuscany-host-embedded-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}/org/apache/tuscany/sca/tuscany-binding-jms/1.0-incubating-SNAPSHOT/tuscany-binding-jms-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}/org/apache/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.jar"/>
<pathelement location="target/classes"/>
</path>
Modified: incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientA.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientA.java?view=diff&rev=542636&r1=542635&r2=542636
==============================================================================
--- incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientA.java (original)
+++ incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientA.java Tue May 29 12:49:00 2007
@@ -28,16 +28,16 @@
public class CalculatorClientA {
public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
+ SCADomain scaDomain = SCADomain.newInstance("sca://mydomain/A", "/", "Calculator.composite");
CalculatorService calculatorService =
scaDomain.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));
+ // 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();
}
Modified: incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientB.java?view=diff&rev=542636&r1=542635&r2=542636
==============================================================================
--- incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientB.java (original)
+++ incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorClientB.java Tue May 29 12:49:00 2007
@@ -19,6 +19,8 @@
package calculator;
+import java.io.IOException;
+
import org.apache.tuscany.sca.host.embedded.SCADomain;
/**
@@ -28,17 +30,14 @@
public class CalculatorClientB {
public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService =
- scaDomain.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 scaDomain = SCADomain.newInstance("sca://mydomain/B","/","Calculator.composite");
+ try {
+ System.out.println("Runtime sca://mydomain/B started (press enter to shutdown)");
+ System.in.read();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
scaDomain.close();
}
Modified: incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java?view=diff&rev=542636&r1=542635&r2=542636
==============================================================================
--- incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java Tue May 29 12:49:00 2007
@@ -36,17 +36,17 @@
this.addService = addService;
}
- @Reference
+// @Reference
public void setSubtractService(SubtractService subtractService) {
- this.subtractService = subtractService;
+ this.subtractService = subtractService;
}
- @Reference
+// @Reference
public void setDivideService(DivideService divideService) {
this.divideService = divideService;
}
- @Reference
+// @Reference
public void setMultiplyService(MultiplyService multiplyService) {
this.multiplyService = multiplyService;
}
Modified: incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/resources/Calculator.composite?view=diff&rev=542636&r1=542635&r2=542636
==============================================================================
--- incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/sandbox/slaws/calculator-distributed/src/main/resources/Calculator.composite Tue May 29 12:49:00 2007
@@ -20,28 +20,30 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="Calculator">
- <component name="CalculatorServiceComponent" runtimeId="NodeA">
+ <component name="CalculatorServiceComponent" runtimeId="sca://mydomain/A">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" target="AddServiceComponent" />
+<!--
<reference name="subtractService" target="SubtractServiceComponent" />
<reference name="multiplyService" target="MultiplyServiceComponent" />
<reference name="divideService" target="DivideServiceComponent" />
+-->
</component>
- <component name="AddServiceComponent" runtimeId="NodeB">
+ <component name="AddServiceComponent" runtimeId="sca://mydomain/B">
<implementation.java class="calculator.AddServiceImpl" />
</component>
-
- <component name="SubtractServiceComponent" runtimeId="NodeB">
+<!--
+ <component name="SubtractServiceComponent" runtimeId="sca://mydomain/B">
<implementation.java class="calculator.SubtractServiceImpl" />
</component>
- <component name="MultiplyServiceComponent" runtimeId="NodeB">
+ <component name="MultiplyServiceComponent" runtimeId="sca://mydomain/B">
<implementation.java class="calculator.MultiplyServiceImpl" />
</component>
- <component name="DivideServiceComponent" runtimeId="NodeB">
+ <component name="DivideServiceComponent" runtimeId="sca://mydomain/B">
<implementation.java class="calculator.DivideServiceImpl" />
</component>
-
+-->
</composite>
Modified: incubator/tuscany/sandbox/slaws/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/slaws/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java?view=diff&rev=542636&r1=542635&r2=542636
==============================================================================
--- incubator/tuscany/sandbox/slaws/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java (original)
+++ incubator/tuscany/sandbox/slaws/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java Tue May 29 12:49:00 2007
@@ -42,9 +42,9 @@
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.subtract(3, 2), 1.0);
+// assertEquals(calculatorService.multiply(3, 2), 6.0);
+// assertEquals(calculatorService.divide(3, 2), 1.5);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org