You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/04 17:09:35 UTC

svn commit: r535285 - in /incubator/tuscany/java/sca/samples/calculator-script/src/main: java/calculator/CalculatorClient.java resources/Calculator.composite resources/calculator/SubtractServiceImpl.rb

Author: antelder
Date: Fri May  4 08:09:35 2007
New Revision: 535285

URL: http://svn.apache.org/viewvc?view=rev&rev=535285
Log:
Get the script calculator sample working

Modified:
    incubator/tuscany/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
    incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite
    incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb

Modified: incubator/tuscany/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java?view=diff&rev=535285&r1=535284&r2=535285
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorClient.java Fri May  4 08:09:35 2007
@@ -19,10 +19,7 @@
 
 package calculator;
 
-import org.apache.tuscany.host.embedded.SCARuntime;
 import org.apache.tuscany.host.embedded.SCARuntimeActivator;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -31,10 +28,9 @@
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        SCARuntime.start("Calculator.composite");
-        ComponentContext context = SCARuntime.getComponentContext("CalculatorServiceComponent");
-        ServiceReference<CalculatorService> service = context.createSelfReference(CalculatorService.class);
-        CalculatorService calculatorService = service.getService();
+        SCARuntimeActivator.start("Calculator.composite");
+        CalculatorService calculatorService = 
+            SCARuntimeActivator.locateService(CalculatorService.class, "CalculatorServiceComponent");
 
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
         System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

Modified: incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite?view=diff&rev=535285&r1=535284&r2=535285
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/Calculator.composite Fri May  4 08:09:35 2007
@@ -33,19 +33,19 @@
     </component>
 
     <component name="AddServiceComponent">
-        <implementation.script script="calculator.AddServiceImpl.js"/>
+        <implementation.script script="calculator/AddServiceImpl.js"/>
     </component>
 
     <component name="SubtractServiceComponent">
-        <implementation.script script="calculator.SubtractServiceImpl.rb"/>
+        <implementation.script script="calculator/SubtractServiceImpl.rb"/>
     </component>
 
     <component name="MultiplyServiceComponent">
-        <implementation.script script="calculator.MultiplyServiceImpl.py"/>
+        <implementation.script script="calculator/MultiplyServiceImpl.py"/>
     </component>
 
     <component name="DivideServiceComponent">
-        <implementation.script script="calculator.DivideServiceImpl.groovy"/>
+        <implementation.script script="calculator/DivideServiceImpl.groovy"/>
     </component>
 
 </composite>

Modified: incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb?view=diff&rev=535285&r1=535284&r2=535285
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb (original)
+++ incubator/tuscany/java/sca/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb Fri May  4 08:09:35 2007
@@ -16,6 +16,6 @@
 # under the License.
 #
  
-def subtract(n1 n2)
+def subtract(n1, n2)
     return n1 - n2
 end



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org