You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/07/07 10:23:45 UTC
svn commit: r961298 - in
/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources:
HelloWorldImplService_schema1.xsd HelloWorldImplService_schema2.xsd
Author: slaws
Date: Wed Jul 7 08:23:45 2010
New Revision: 961298
URL: http://svn.apache.org/viewvc?rev=961298&view=rev
Log:
TUSCANY-3616 - correct WSDL/XSD to match Java interface description
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
Modified: tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd?rev=961298&r1=961297&r2=961298&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd (original)
+++ tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd Wed Jul 7 08:23:45 2010
@@ -19,7 +19,10 @@
-->
<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/"
xmlns:tns="http://ws.binding.sca.tuscany.apache.org/"
+ xmlns:tns2="http://helloworld/external"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService_schema2.xsd"/>
<xs:element name="Exception" type="tns:Exception"/>
@@ -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-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd?rev=961298&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd (added)
+++ tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd Wed Jul 7 08:23:45 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>
+