Set up for JSON test.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153341 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 5 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java b/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
index 9c9422a74b..5c28ceaa8e 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
@@ -82,8 +82,7 @@ public class ClientImpl implements ClientIntf {
         Name name = new Name();

         name.setFirstName("Jason");

         name.setLastName("Nosaj");

-        String retVal = service.greetJSON(name);

-        assertEquals("good", retVal);

+        service.greetJSON(name);        

     }

     

 //    @Override

diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java b/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
index 361e0f7dd6..6101bb65b3 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
@@ -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);

 }

diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java b/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
index dc25eb07b1..a708974bf4 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
@@ -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

diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java b/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
index b8fe5eb018..933aadeaa3 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
@@ -56,7 +56,7 @@ public class ServiceImpl implements ServiceIntf {
     }

 

     @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 ServiceIntf {
         } catch (JSONException exc) {

             throw new RuntimeException(exc);

         }

-        return "good";

     }