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 2010/08/16 22:43:22 UTC

svn commit: r986127 - in /tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main: java/calculator/AddServiceImpl.java webapp/calculate.html

Author: slaws
Date: Mon Aug 16 20:43:22 2010
New Revision: 986127

URL: http://svn.apache.org/viewvc?rev=986127&view=rev
Log:
Correct the DOJO callback configuration and show the result at client and server

Modified:
    tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html

Modified: tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java?rev=986127&r1=986126&r2=986127&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java Mon Aug 16 20:43:22 2010
@@ -37,6 +37,7 @@ public class AddServiceImpl implements A
     
     public AddBean addComplexParam(AddBean aBean) {
         aBean.setN3(aBean.getN1() + aBean.getN2());
+        System.out.println("Adding " + aBean.getN1() + " to " + aBean.getN1() + " gives " + aBean.getN3());
         return aBean;
     }
 

Modified: tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html?rev=986127&r1=986126&r2=986127&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html Mon Aug 16 20:43:22 2010
@@ -21,10 +21,11 @@
 <head>
    <title>Apache Tuscany binding-jsonrpc Calculator WebApp with DOJO Sample</title>
 
-   <script type="text/javascript" src="/dojo/dojo.js"></script>
+   <script type="text/javascript" src="dojo/dojo/dojo.js"></script>
    <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
 
    <script language="JavaScript">
+      dojo.require("dojo.rpc.JsonService"); 
    
       var addService = new dojo.rpc.JsonService("AddServiceComponent/AddService?smd");
    
@@ -38,11 +39,11 @@
          addRequest.x = 2;
          addRequest.y = 3;
 
-         addService.add(addRequest, calculateResponse);
+         addService.addComplexParam(addRequest).addCallback(calculateResponse);
       }
 
       function calculateResponse(reply) {
-         document.getElementById('result').innerHTML=reply;
+         document.getElementById('result').innerHTML=reply.n3;
       }
 
    </script>
@@ -53,11 +54,10 @@
 
 <h2>Apache Tuscany binding-jsonrpc Calculator WebApp with DOJO Sample</h2>
 
-    <input type="text" id="name" width="10">
-
+    1 + 1 = 
     <button name="submit" onclick="calculate()">Calculate</button>
 
-    <div id='result'></div>
+    <div id='result'/>
 
 </body>
-</html>
\ No newline at end of file
+</html>