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/06/20 11:07:28 UTC
svn commit: r549007 - in
/incubator/tuscany/java/sca/samples/calculator-distributed: ./
src/main/java/calculator/ src/main/resources/ src/test/java/calculator/
Author: slaws
Date: Wed Jun 20 02:07:27 2007
New Revision: 549007
URL: http://svn.apache.org/viewvc?view=rev&rev=549007
Log:
Expand sample to 3 nodes to match the diagram
TUSCANY-1338
Added:
incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.png (with props)
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.svg
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeExe.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/build.xml?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/build.xml Wed Jun 20 02:07:27 2007
@@ -110,6 +110,17 @@
</java>
</target>
+ <target name="runC">
+ <java classname="${test.class}"
+ fork="true">
+ <classpath>
+ <!--pathelement path="target/classes"/-->
+ <!--pathelement location="../../lib/tuscany-sca-manifest.jar"/-->
+ <path refid="test.classpath"/>
+ </classpath>
+ <arg value="nodeC"/>
+ </java>
+ </target>
<target name="clean">
<delete quiet="true" includeemptydirs="true">
Added: incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.png
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.png?view=auto&rev=549007
==============================================================================
Binary file - no diff available.
Propchange: incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.svg
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.svg?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.svg (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/calculator-distributed.svg Wed Jun 20 02:07:27 2007
@@ -31,12 +31,12 @@
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\sandbox\slaws\calculator-distributed"
+ sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed"
sodipodi:docname="calculator-distributed.svg"
version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator\calculator.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
+ inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed\calculator-distributed.png"
+ inkscape:export-xdpi="104.05"
+ inkscape:export-ydpi="104.05">
<defs
id="defs4" />
<sodipodi:namedview
@@ -327,15 +327,6 @@
d="M 477.14286,404.09448 L 527.85714,404.09448 L 527.85714,427.66591 L 580,426.95163"
id="path1950" />
<rect
- style="opacity:0.32777778;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999928, 1.99999976;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1954"
- width="328.57144"
- height="277.85715"
- x="165.71428"
- y="221.23734"
- rx="6.9961648"
- ry="5.8193965" />
- <rect
style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999869, 1.99999955;stroke-dashoffset:0;stroke-opacity:1"
id="rect2844"
width="328.57144"
@@ -353,35 +344,8 @@
y="268.73746"
rx="6.9961648"
ry="2.0644646" />
- <rect
- style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999975, 1.99999991;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2848"
- width="328.57144"
- height="95.714294"
- x="534.28571"
- y="380.16605"
- rx="6.9961648"
- ry="2.0046251" />
- <rect
- style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999925, 1.99999974;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2850"
- width="328.57144"
- height="104.99999"
- x="534.28571"
- y="487.30896"
- rx="6.9961648"
- ry="2.1991034" />
<flowRoot
xml:space="preserve"
- id="flowRoot2852"><flowRegion
- id="flowRegion2854"><rect
- id="rect2856"
- width="75"
- height="32.857143"
- x="173.57143"
- y="231.95163" /></flowRegion><flowPara
- id="flowPara2858">RuntimeA</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
id="flowRoot2860"
transform="translate(614.3034,-75.00004)"><flowRegion
id="flowRegion2862"><rect
@@ -390,7 +354,7 @@
height="32.857143"
x="173.57143"
y="231.95163" /></flowRegion><flowPara
- id="flowPara2866">RuntimeB</flowPara></flowRoot> <flowRoot
+ id="flowPara2866">nodeB</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot2868"
transform="translate(616.0952,47.8571)"><flowRegion
@@ -400,25 +364,20 @@
height="32.857143"
x="173.57143"
y="231.95163" /></flowRegion><flowPara
- id="flowPara2874">RuntimeC</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2876"
- transform="translate(617.5238,158.5714)"><flowRegion
- id="flowRegion2878"><rect
- id="rect2880"
- width="75"
- height="32.857143"
- x="173.57143"
- y="231.95163" /></flowRegion><flowPara
- id="flowPara2882">RuntimeD</flowPara></flowRoot> <flowRoot
+ id="flowPara2874">nodeC</flowPara></flowRoot> <path
+ style="opacity:0.35555558;fill:#efacac;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,3;stroke-dashoffset:0"
+ d="M 172.73609,222.85576 L 495.9849,223.86592 L 498.00521,384.48017 L 863.68043,383.47002 L 862.67028,606.71373 L 173.74624,605.70358 L 172.73609,222.85576 z "
+ id="path1975"
+ sodipodi:nodetypes="ccccccc" />
+ <flowRoot
xml:space="preserve"
- id="flowRoot2884"
- transform="translate(621.0952,264.9999)"><flowRegion
- id="flowRegion2886"><rect
- id="rect2888"
+ id="flowRoot2852"
+ transform="translate(8,0)"><flowRegion
+ id="flowRegion2854"><rect
+ id="rect2856"
width="75"
height="32.857143"
x="173.57143"
y="231.95163" /></flowRegion><flowPara
- id="flowPara2890">RuntimeE</flowPara></flowRoot> </g>
+ id="flowPara2858">nodeA</flowPara></flowRoot> </g>
</svg>
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNode.java Wed Jun 20 02:07:27 2007
@@ -90,7 +90,10 @@
domain.getNodeService(ComponentRegistry.class, "ComponentRegistry");
componentRegistry.setComponentNode("CalculatorServiceComponent", "nodeA");
- componentRegistry.setComponentNode("AddServiceComponent", "nodeB");
+ componentRegistry.setComponentNode("AddServiceComponent", "nodeB");
+ componentRegistry.setComponentNode("SubtractServiceComponent", "nodeC");
+ componentRegistry.setComponentNode("MultiplyServiceComponent", "nodeA");
+ componentRegistry.setComponentNode("DivideServiceComponent", "nodeA");
// find the current directory as a URL. This is where our contribution
// will come from
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeExe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeExe.java?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeExe.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorNodeExe.java Wed Jun 20 02:07:27 2007
@@ -49,6 +49,9 @@
// 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));
} else {
// start up and wait for messages
try {
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java Wed Jun 20 02:07:27 2007
@@ -36,20 +36,21 @@
this.addService = addService;
}
-// @Reference
+ @Reference
public void setSubtractService(SubtractService subtractService) {
this.subtractService = subtractService;
}
-// @Reference
- public void setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
-// @Reference
+ @Reference
public void setMultiplyService(MultiplyService multiplyService) {
this.multiplyService = multiplyService;
}
+
+ @Reference
+ public void setDivideService(DivideService divideService) {
+ this.divideService = divideService;
+ }
+
public double add(double n1, double n2) {
System.out.println("CalculatorService - add " + n1 + " and " + n2);
@@ -57,14 +58,17 @@
}
public double subtract(double n1, double n2) {
+ System.out.println("CalculatorService - subtract " + n1 + " and " + n2);
return subtractService.subtract(n1, n2);
}
public double multiply(double n1, double n2) {
+ System.out.println("CalculatorService - multiply " + n1 + " and " + n2);
return multiplyService.multiply(n1, n2);
}
public double divide(double n1, double n2) {
+ System.out.println("CalculatorService - divide " + n1 + " and " + n2);
return divideService.divide(n1, n2);
}
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java Wed Jun 20 02:07:27 2007
@@ -24,6 +24,7 @@
public class SubtractServiceImpl implements SubtractService {
public double subtract(double n1, double n2) {
+ System.out.println("SubtractService - subtract " + n1 + " and " + n2);
return n1 - n2;
}
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/Calculator.composite Wed Jun 20 02:07:27 2007
@@ -24,18 +24,17 @@
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent" />
-<!--
+ <reference name="addService" target="AddServiceComponent" />
<reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
+ <reference name="multiplyService" target="MultiplyServiceComponent" />
<reference name="divideService" target="DivideServiceComponent" />
--->
+
</component>
<component name="AddServiceComponent">
<implementation.java class="calculator.AddServiceImpl" />
</component>
-<!--
+
<component name="SubtractServiceComponent">
<implementation.java class="calculator.SubtractServiceImpl" />
</component>
@@ -47,5 +46,5 @@
<component name="DivideServiceComponent">
<implementation.java class="calculator.DivideServiceImpl" />
</component>
--->
+
</composite>
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/runtime.topology Wed Jun 20 02:07:27 2007
@@ -28,6 +28,11 @@
<schema name="http" baseURL="http://localhost:81"/>
<schema name="https" baseURL="https://localhost:444" />
<component name="AddServiceComponent"/>
- </node>
+ </node>
+ <node name="nodeC">
+ <schema name="http" baseURL="http://localhost:81"/>
+ <schema name="https" baseURL="https://localhost:444" />
+ <component name="SubtractServiceComponent"/>
+ </node>
</runtime>
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java?view=diff&rev=549007&r1=549006&r2=549007
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorTestCase.java Wed Jun 20 02:07:27 2007
@@ -37,6 +37,8 @@
private static SCADomain domainA;
private static CalculatorNode nodeB;
private static SCADomain domainB;
+ private static CalculatorNode nodeC;
+ private static SCADomain domainC;
private static CalculatorService calculatorService;
@BeforeClass
@@ -58,6 +60,11 @@
nodeB = new CalculatorNode("domainA","nodeB");
domainB = nodeB.startDomain();
+ // start the node that runs the
+ // subtract component
+ nodeC = new CalculatorNode("domainA","nodeC");
+ domainC = nodeC.startDomain();
+
calculatorService = domainA.getService(CalculatorService.class, "CalculatorServiceComponent");
}
@@ -66,6 +73,7 @@
// stop the domains
nodeA.stopDomain();
nodeB.stopDomain();
+ nodeC.stopDomain();
// stop the ActiveMQ broker
broker.stop();
@@ -76,9 +84,9 @@
// Calculate
Assert.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);
+ Assert.assertEquals(calculatorService.subtract(3, 2), 1.0);
+ Assert.assertEquals(calculatorService.multiply(3, 2), 6.0);
+ Assert.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