From 5e2844b0daa60f187a9f4000862af2902fb399b1 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 7 Jul 2010 08:21:46 +0000
Subject: TUSCANY-3616 - correct WSDL/XSD to match Java interface description

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@961295 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/HelloWorldImplService-doclit.wsdl    |  2 +-
 .../resources/HelloWorldImplService-doclit.xsd     | 95 ----------------------
 .../resources/HelloWorldImplService-doclit1.xsd    | 83 +++++++++++++++++++
 .../resources/HelloWorldImplService-doclit2.xsd    | 40 +++++++++
 4 files changed, 124 insertions(+), 96 deletions(-)
 delete mode 100644 sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.xsd
 create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
 create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd

(limited to 'sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src')

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
index 50dbb194eb..f5a25b39f8 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
@@ -26,7 +26,7 @@
   <types>
     <xsd:schema>
       <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/doclit" 
-                  schemaLocation="HelloWorldImplService_schema1.xsd"/>
+                  schemaLocation="HelloWorldImplService_doclit1.xsd"/>
     </xsd:schema>
   </types>
   <message name="getGreetings">
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.xsd
deleted file mode 100644
index 1d9c65c31b..0000000000
--- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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://ws.binding.sca.tuscany.apache.org/doclit" 
-                         xmlns:tns="http://ws.binding.sca.tuscany.apache.org/doclit" 
-                         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <xs:element name="Exception" type="tns:Exception"/>
-
-  <xs:element name="getGreetings" type="tns:getGreetings"/>
-
-  <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
-  <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
-  <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
-
-  <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
-
-  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
-  <xs:complexType name="getGreetingsException">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getGreetingsExceptionResponse">
-    <xs:sequence>
-      <xs:element name="return" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="Exception">
-    <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getGreetings">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getGreetingsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="xs:string" 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-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
new file mode 100644
index 0000000000..545820a07d
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
@@ -0,0 +1,83 @@
+<?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://ws.binding.sca.tuscany.apache.org/doclit" 
+                         xmlns:tns="http://ws.binding.sca.tuscany.apache.org/doclit" 
+                         xmlns:tns2="http://helloworld/external" 
+                         xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                         
+  <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService-doclit2.xsd"/>
+
+  <xs:element name="Exception" type="tns:Exception"/>
+
+  <xs:element name="getGreetings" type="tns:getGreetings"/>
+
+  <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
+
+  <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
+
+  <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
+
+  <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
+
+  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
+
+  <xs:complexType name="getGreetingsException">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsExceptionResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="Exception">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetings">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsComplex">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns2:foo" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getGreetingsComplexResponse">
+    <xs:sequence>
+      <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-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
new file mode 100644
index 0000000000..d955cc2af4
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.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>
+
-- 
cgit v1.2.3