Add in a complex type test (was HelloWorldNoWSDLTestCase. Simplify package naming to match other ws tests.

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

5 files changed, 115 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
new file mode 100644
index 0000000000..a1233f6d25
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2;
+
+import java.io.Serializable;
+
+public class Bar implements Serializable {
+    private static final long serialVersionUID = 1249963611910502668L;
+    
+    private String s;
+    private int x;
+    private Integer y;
+    
+    private Boolean b;
+    
+    public Boolean getB() {
+        return b;
+    }
+    public void setB(Boolean b) {
+        this.b = b;
+    }
+    public String getS() {
+        return s;
+    }
+    public void setS(String s) {
+        this.s = s;
+    }
+    public int getX() {
+        return x;
+    }
+    public void setX(int x) {
+        this.x = x;
+    }
+    public Integer getY() {
+        return y;
+    }
+    public void setY(Integer y) {
+        this.y = y;
+    }
+    
+}
diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
new file mode 100644
index 0000000000..0695ace7f4
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.ws.axis2;
+
+import java.io.Serializable;
+
+public class Foo implements Serializable {
+    private static final long serialVersionUID = 4879476066850018458L;
+    
+    private Bar[] bars;
+
+    public Bar[] getBars() {
+        return bars;
+    }
+
+    public void setBars(Bar[] bars) {
+        this.bars = bars;
+    }
+}
diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index 98eb6e361b..f39566ccbf 100644
--- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.ws.axis2.helloworld;
+package org.apache.tuscany.sca.binding.ws.axis2;
 
 import org.oasisopen.sca.annotation.Remotable;
 
@@ -25,5 +25,5 @@ import org.oasisopen.sca.annotation.Remotable;
 public interface HelloWorld {
     
     String getGreetings(String s);
-
+    Foo getGreetingsComplex(Foo foo);
 }
diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
index 2c6c4fc92c..332f825a51 100644
--- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.ws.axis2.helloworld;
+package org.apache.tuscany.sca.binding.ws.axis2;
 
 import org.oasisopen.sca.annotation.Reference;
 
@@ -32,4 +32,9 @@ public class HelloWorldClient implements HelloWorld {
         return response;
     }
 
+    public Foo getGreetingsComplex(Foo foo){
+        Foo response = helloWorldWS.getGreetingsComplex(foo);
+        System.out.println("At client: " + response.getBars()[0].getS());
+        return response;
+    }
 }
diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 3662007984..3bbf50a728 100644
--- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.binding.ws.axis2.helloworld;
+package org.apache.tuscany.sca.binding.ws.axis2;
 
 public class HelloWorldService implements HelloWorld {
 
@@ -26,5 +26,17 @@ public class HelloWorldService implements HelloWorld {
         System.out.println("At service: " + response);
         return response;
     }
+    
+    public Foo getGreetingsComplex(Foo foo){
+        Foo response = foo;
+        Bar b3 = new Bar();
+        b3.setS("simon");
+        b3.setX(4);
+        b3.setY(new Integer(5));
+        b3.setB(Boolean.TRUE);
+        response.getBars()[1] = b3;
+        System.out.println("At sevice: " + response.getBars()[0].getS());
+        return response;
+    }    
 
 }