3 files changed, 46 insertions, 18 deletions
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-doclit1.xsd
index 1d9c65c31b..545820a07d 100644
--- 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-doclit1.xsd
@@ -19,7 +19,10 @@
 -->
 <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"/>
 
@@ -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-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>
+