Switch cross-databinding test from SDO (which I can't get working) to DOM, but left tests @Ignore(d)

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

2 files changed, 15 insertions, 25 deletions

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 fd258b3611..1b8145520f 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,20 +37,14 @@ public interface ServiceIntf {
     boolean areNamesTheSameObjects(Name name1, Name name2);

     Name greet(Name name);

     

-    //@DataBinding("JSON")

-    //@RequestWrapper(localName = "greetJSON", targetNamespace = "http://intf/internal/itest/", className = "org.codehaus.jettison.json.JSONObject")

-    //@ResponseWrapper(localName = "greetJSONResponse", targetNamespace = "http://intf/internal/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")

+    //@ResponseWrapper(localName = "greetJSONResponse", targetNamespace = "http://intf.privatecopy.itest/", className = "org.codehaus.jettison.json.JSONObject")

+    String greetJSON(JSONObject name);    

     

-    //@RequestWrapper(localName = "greetSDO", targetNamespace = "http://intf/internal/itest/", className = "commonj.sdo.DataObject")

-    //@ResponseWrapper(localName = "greetSDOResponse", targetNamespace = "http://intf/internal/itest/", className = "commonj.sdo.DataObject")

-    //@DataBinding("commonj.sdo.DataObject")

-    void greetSDO(DataObject name);

+    //@RequestWrapper(localName = "greetDOM", targetNamespace = "http://intf.privatecopy.itest/", className = "org.w3c.dom.Node")

+    //@ResponseWrapper(localName = "greetDOMResponse", targetNamespace = "http://intf.privatecopy.itest/", className = "org.w3c.dom.Node")

+    String greetDOM(Node name);

     

-    //@RequestWrapper(localName = "greetDOM", targetNamespace = "http://intf/internal/itest/", className = "org.w3c.dom.Node")

-    //@ResponseWrapper(localName = "greetDOMResponse", targetNamespace = "http://intf/internal/itest/", className = "org.w3c.dom.Node")

-    //@DataBinding("org.w3c.dom.Node")    

-    Node greetDOM(Node name);

+    Node returnDOM(Node name);

 

 }

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 b8490c073a..435c6c93d9 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
@@ -61,21 +61,17 @@ public class ServiceImpl implements ServiceIntf {
         return "good";

     }

 

+

+    @Override

+    public String greetDOM(Node name) {

+	return "fail";

+    }

+    

     @Override

-    public void greetSDO(DataObject name) {

-        DataObject firstNameDO = (DataObject)((List)name.get("firstName")).get(0);

-        DataObject lastNameDO = (DataObject)((List)name.get("lastName")).get(0);

-        Object firstName = firstNameDO.get(0);

-        Object lastName = lastNameDO.get(0);

-        //assertEquals("SDO", firstName);

-        //assertEquals("ODS", lastName);

-        //return "good";

+    public Node returnDOM(Node name) {

+        return name;

     }

 

-	@Override

-	public Node greetDOM(Node name) {

-		return name;

-	}

 }