TUSCANY-3616 - correct WSDL/XSD to match Java interface description

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

3 files changed, 50 insertions, 21 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
index d3806b24f4..0c11e6a8f4 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
@@ -20,13 +20,14 @@
 <definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/rpclit" 

              name="HelloWorldImplService" 

              xmlns="http://schemas.xmlsoap.org/wsdl/" 

-             xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit" 

+             xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit"

+             xmlns:tns2="http://helloworld/external" 

              xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

              xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">

   <types>

     <xsd:schema>

       <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/rpclit" 

-                  schemaLocation="HelloWorldImplService-rpclit.xsd"/>

+                  schemaLocation="HelloWorldImplService-rpclit1.xsd"/>

     </xsd:schema>

   </types>

   <message name="getGreetings">

@@ -45,10 +46,10 @@
     <part name="fault" element="tns:Exception"/>

   </message>

   <message name="getGreetingsComplex">

-    <part name="foo" type="tns:foo"/>

+    <part name="foo" type="tns2:foo"/>

   </message>

   <message name="getGreetingsComplexResponse">

-    <part name="foo" type="tns:foo"/>

+    <part name="foo" type="tns2:foo"/>

   </message>

   <portType name="HelloWorldImpl">

     <operation name="getGreetings">

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
index 31bd769dbe..8841f0dcf2 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd
+++ b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
@@ -19,8 +19,11 @@
 -->

 <xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/rpclit" 

                          xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit" 

+                         xmlns:tns2="http://helloworld/external"

                          xmlns:xs="http://www.w3.org/2001/XMLSchema">

 

+  <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService-rpclit2.xsd"/>

+  

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

 

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

@@ -67,28 +70,13 @@
 

   <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:element name="arg0" type="tns2:foo" minOccurs="0"/>

     </xs:sequence>

   </xs:complexType>

 

   <xs:complexType name="getGreetingsComplexResponse">

     <xs:sequence>

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

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

     </xs:sequence>

   </xs:complexType>

 </xs:schema>

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
new file mode 100644
index 0000000000..d955cc2af4
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<!--

+ * 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.    

+-->

+<xs:schema version="1.0" targetNamespace="http://helloworld/external" 

+                         xmlns:tns="http://helloworld/external" 

+                         xmlns:xs="http://www.w3.org/2001/XMLSchema">

+

+  <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:schema>

+