Turn complex message passing test back on

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

6 files changed, 57 insertions, 98 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/Bar.java b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/Bar.java
deleted file mode 100644
index 379af8df00..0000000000
--- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/Bar.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

- * 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;

-

-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/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/Foo.java b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/Foo.java
deleted file mode 100644
index e4fee2c4c9..0000000000
--- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/Foo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*

- * 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;

-

-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/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 80ef9b5167..6bc67db5fc 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
@@ -19,6 +19,7 @@
 

 package org.apache.tuscany.sca.binding.ws;

 

+import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;

 import org.oasisopen.sca.ServiceRuntimeException;

 import org.oasisopen.sca.annotation.Remotable;

 

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index eb405471a8..8f57680d47 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
@@ -21,6 +21,7 @@ package org.apache.tuscany.sca.binding.ws;
 

 import javax.jws.WebService;

 

+import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;

 import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;

 import org.oasisopen.sca.ServiceRuntimeException;

 import org.oasisopen.sca.annotation.Reference;

@@ -46,8 +47,9 @@ public class HelloWorldImpl implements HelloWorld {
     }    

 

     public Foo getGreetingsComplex(Foo foo){

-        Foo response = null;//helloWorldExternal.getGreetingsComplex(foo);

-        System.out.println("At client: " + response.getBars()[0].getS());

+        System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());

+        Foo response = helloWorldExternal.getGreetingsComplex(foo);

+        System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());

         return response;

     } 

 }

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index e8d4340886..acdfcaaaa5 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
@@ -21,6 +21,10 @@
 

   <xs:element name="getGreetings" type="tns:getGreetings"/>

 

+  <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>

+

+  <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>

+

   <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>

 

   <xs:complexType name="getGreetings">

@@ -34,5 +38,33 @@
       <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>

     </xs:sequence>

   </xs:complexType>

+

+  <xs:complexType name="getGreetingsComplex">

+    <xs:sequence>

+      <xs:element name="arg0" type="tns:foo" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:complexType name="foo">

+    <xs:sequence>

+      <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:complexType name="bar">

+    <xs:sequence>

+      <xs:element name="b" type="xs:boolean" minOccurs="0"/>

+      <xs:element name="s" type="xs:string" minOccurs="0"/>

+      <xs:element name="x" type="xs:int"/>

+      <xs:element name="y" type="xs:int" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>

+

+  <xs:complexType name="getGreetingsComplexResponse">

+    <xs:sequence>

+      <xs:element name="return" type="tns:foo" minOccurs="0"/>

+    </xs:sequence>

+  </xs:complexType>

 </xs:schema>

 

+

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
index 2aa1a8f149..837bcb059e 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
@@ -30,11 +30,21 @@
   <message name="getGreetingsResponse">

     <part name="parameters" element="tns:getGreetingsResponse"/>

   </message>

+  <message name="getGreetingsComplex">

+    <part name="parameters" element="tns:getGreetingsComplex"/>

+  </message>

+  <message name="getGreetingsComplexResponse">

+    <part name="parameters" element="tns:getGreetingsComplexResponse"/>

+  </message>

   <portType name="HelloWorldService">

     <operation name="getGreetings">

       <input message="tns:getGreetings"/>

       <output message="tns:getGreetingsResponse"/>

     </operation>

+    <operation name="getGreetingsComplex">

+      <input message="tns:getGreetingsComplex"/>

+      <output message="tns:getGreetingsComplexResponse"/>

+    </operation>

   </portType>

   <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">

     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -47,11 +57,19 @@
         <soap:body use="literal"/>

       </output>

     </operation>

+    <operation name="getGreetingsComplex">

+      <soap:operation soapAction=""/>

+      <input>

+        <soap:body use="literal"/>

+      </input>

+      <output>

+        <soap:body use="literal"/>

+      </output>

+    </operation>

   </binding>

   <service name="HelloWorldServiceService">

     <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">

-      <soap:address location="http://localhost:8086/External/HelloWorld"/>

+      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>

     </port>

   </service>

 </definitions>

-