tuscany-commits mailing list archives

Author: scottkurz
Date: Wed Aug  3 04:27:51 2011
New Revision: 1153341

URL: http://svn.apache.org/viewvc?rev=1153341&view=rev
Log:
Set up for JSON test.

Modified:
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java

Modified: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java?rev=1153341&r1=1153340&r2=1153341&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
Wed Aug  3 04:27:51 2011
@@ -82,8 +82,7 @@ public class ClientImpl implements Clien
         Name name = new Name();
         name.setFirstName("Jason");
         name.setLastName("Nosaj");
-        String retVal = service.greetJSON(name);
-        assertEquals("good", retVal);
+        service.greetJSON(name);        
     }
     
 //    @Override

Modified: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java?rev=1153341&r1=1153340&r2=1153341&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
Wed Aug  3 04:27:51 2011
@@ -33,7 +33,7 @@ public interface ServiceIntf {    
     Name greet(Name name);
     boolean areNamesTheSameObjects(Name name1, Name name2);
     
-    String greetJSON(Name name);
+    void greetJSON(Name name);
     String greetDOM(Name name);        
     Node returnDOM(Node name);
 }

Modified: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java?rev=1153341&r1=1153340&r2=1153341&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
Wed Aug  3 04:27:51 2011
@@ -37,8 +37,8 @@ public interface ServiceIntf {
     boolean areNamesTheSameObjects(Name name1, Name name2);
     Name greet(Name name);
     
-    //@RequestWrapper(localName = "greetJSON", targetNamespace = "http://intf.privatecopy.itest/",
className = "org.codehaus.jettison.json.JSONObject")
-    String greetJSON(JSONObject name);    
+    @RequestWrapper(localName = "greetJSON", targetNamespace = "http://intf.privatecopy.itest/",
className = "org.codehaus.jettison.json.JSONObject")
+    void greetJSON(JSONObject name);    
     
     @RequestWrapper(localName = "greetDOM", targetNamespace = "http://intf.privatecopy.itest/",
className = "org.w3c.dom.Node")
     // Won't work because of 2931 - lack of separation of req. vs. resp

Modified: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java?rev=1153341&r1=1153340&r2=1153341&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
Wed Aug  3 04:27:51 2011
@@ -56,7 +56,7 @@ public class ServiceImpl implements Serv
     }
 
     @Override
-    public String greetJSON(JSONObject name) {
+    public void greetJSON(JSONObject name) {
         try {
             String firstName = name.getString("firstName");
             String lastName = name.getString("lastName");
@@ -65,7 +65,6 @@ public class ServiceImpl implements Serv
         } catch (JSONException exc) {
             throw new RuntimeException(exc);
         }
-        return "good";
     }