tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scottk...@apache.org
Subject svn commit: r1152925 - in /tuscany/sca-java-2.x/trunk/testing/itest/data-copy: ./ client/ client/src/main/java/itest/client/impl/ client/src/main/java/itest/privatecopy/intf/ common/ common/src/main/java/itest/common/intf/ driver/ driver/src/test/java/...
Date Mon, 01 Aug 2011 20:31:58 GMT
Author: scottkurz
Date: Mon Aug  1 20:31:56 2011
New Revision: 1152925

URL: http://svn.apache.org/viewvc?rev=1152925&view=rev
Log:
Switch cross-databinding test from SDO (which I can't get working) to DOM, but left tests
@Ignore(d)

Modified:
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/   (props changed)
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/   (props changed)
    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/common/   (props changed)
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/   (props changed)
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
    tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/   (props changed)
    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

Propchange: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 20:31:56 2011
@@ -0,0 +1 @@
+target

Propchange: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 20:31:56 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

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=1152925&r1=1152924&r2=1152925&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
Mon Aug  1 20:31:56 2011
@@ -86,12 +86,12 @@ public class ClientImpl implements Clien
         assertEquals("good", retVal);
     }
     
-    @Override
-    public void callSDO() {    
+//    @Override
+    public void callDOM() {    
         Name name = new Name();
-        name.setFirstName("SDO");
-        name.setLastName("ODS");
-        service.greetSDO(name);
+        name.setFirstName("DOM");
+        name.setLastName("MOD");
+        String retVal = service.greetDOM(name);
         //assertEquals("good", retVal);
     }
     
@@ -107,7 +107,7 @@ public class ClientImpl implements Clien
             InputSource is = new InputSource( new StringReader(nameString) );
             Document doc = builder.parse(is);
             Node name = doc.getDocumentElement();
-            Node retVal = service.greetDOM(name);
+            Node retVal = service.returnDOM(name);
             assertNotSame("PBV should result in different object", name, retVal);
         } catch (Exception e) {
         	throw new RuntimeException(e);

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=1152925&r1=1152924&r2=1152925&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
Mon Aug  1 20:31:56 2011
@@ -32,11 +32,16 @@ import itest.privatecopy.types.Name;
 public interface ServiceIntf {    
     Name greet(Name name);
     boolean areNamesTheSameObjects(Name name1, Name name2);
+    
+    // Use JAXB on input parm on the client side
     String greetJSON(Name name);
-    void greetSDO(Name 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);
+
+    // Use JAXB on input parm on the client side
+    String greetDOM(Name name);    
+    
+    Node returnDOM(Node name);
 }

Propchange: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 20:31:56 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Modified: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java?rev=1152925&r1=1152924&r2=1152925&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
Mon Aug  1 20:31:56 2011
@@ -26,6 +26,6 @@ public interface ClientIntf {    
     void callJAXBCrossContribution();
     void callObjectGraphCheck(int caseNumber);
     void callJSON();
-    void callSDO();
-	void testRoundTripDOMIdentity();
+    void callDOM();
+    void testRoundTripDOMIdentity();
 }

Propchange: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 20:31:56 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Modified: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java?rev=1152925&r1=1152924&r2=1152925&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
Mon Aug  1 20:31:56 2011
@@ -102,36 +102,38 @@ public class CrossContribTestCase {
 
     @Test
     @Ignore
-    public void testJSONSCA() throws Exception {
+    public void testDOMSCA() throws Exception {
         ClientIntf client = node.getService(ClientIntf.class, "ClientSCA");
         assertNotNull(client);
-        client.callJSON();
+        client.callDOM();
     }
 
     @Test
     @Ignore
-    public void testJSONWS() throws Exception {
+    public void testDOMWS() throws Exception {
         ClientIntf client = node.getService(ClientIntf.class, "ClientWS");
         assertNotNull(client);
-        client.callJSON();
+        client.callDOM();
     }
-
+    
     @Test
     @Ignore
-    public void testSDOWS() throws Exception {
-        ClientIntf client = node.getService(ClientIntf.class, "ClientWS");
+    public void testJSONSCA() throws Exception {
+        ClientIntf client = node.getService(ClientIntf.class, "ClientSCA");
         assertNotNull(client);
-        client.callSDO();
+        client.callJSON();
     }
 
     @Test
     @Ignore
-    public void testSDOSCA() throws Exception {
-        ClientIntf client = node.getService(ClientIntf.class, "ClientSCA");
+    public void testJSONWS() throws Exception {
+        ClientIntf client = node.getService(ClientIntf.class, "ClientWS");
         assertNotNull(client);
-        client.callSDO();
+        client.callJSON();
     }
 
+
+
     @Test
     public void testDOMIdentitySCA() throws Exception {
         ClientIntf client = node.getService(ClientIntf.class, "ClientSCA");

Propchange: tuscany/sca-java-2.x/trunk/testing/itest/data-copy/service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 20:31:56 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

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=1152925&r1=1152924&r2=1152925&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
Mon Aug  1 20:31:56 2011
@@ -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);
 
 }

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=1152925&r1=1152924&r2=1152925&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
Mon Aug  1 20:31:56 2011
@@ -61,21 +61,17 @@ public class ServiceImpl implements Serv
         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;
-	}
 }
 
 



Mime
View raw message