Author: slaws
Date: Wed Jul 7 08:22:58 2010
New Revision: 961297
URL: http://svn.apache.org/viewvc?rev=961297&view=rev
Log:
TUSCANY-3616 - correct WSDL/XSD to match Java interface description
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
- copied, changed from r960537,
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
Removed:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl?rev=961297&r1=961296&r2=961297&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
Wed Jul 7 08:22:58 2010
@@ -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">
Copied:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
(from r960537,
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd?p2=tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd&p1=tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd&r1=960537&r2=961297&rev=961297&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
Wed Jul 7 08:22:58 2010
@@ -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>
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd?rev=961297&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
(added)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
Wed Jul 7 08:22:58 2010
@@ -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>
+
