Turn complex message passing test back on

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

2 files changed, 52 insertions, 2 deletions

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>

-