TUSCANY-3283 - improve the wsdlgen test case to test the situation where a type with a namespace references a type without a namespace

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

2 files changed, 143 insertions, 54 deletions

diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite
index 12ef393521..12d98d3453 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite
+++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite
@@ -22,11 +22,21 @@
 	targetNamespace="http://helloworld"
 	xmlns:hw="http://helloworld"
     name="helloworldws">
+    
+    <component name="HelloWorldClientComponent1">
+        <implementation.java class="helloworld.HelloWorldClientImpl" />
+        <service name="HelloWorldService">
+            <binding.sca/>
+        </service>
+        <reference name="hwService">
+            <binding.ws uri="http://L3AW203:8085/HelloWorldServiceComponent1"/>
+        </reference>
+    </component>    
 
     <component name="HelloWorldServiceComponent1">
         <implementation.java class="helloworld.HelloWorldImpl" />
 	    <service name="HelloWorldService">
-            <binding.ws/>
+            <binding.ws uri="http://L3AW203:8085/HelloWorldServiceComponent1"/>
         </service>
     </component>
     
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
index 35dfe95359..2f7b40e0ed 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl
+++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 *
@@ -14,8 +14,15 @@
         express or implied. See the License for the * specific language
         governing permissions and limitations * under the License.
     -->
+
+    <!--
+        Generated by pointing a browser at
+        http://l3aw203:8085/HelloWorldServiceComponent1?wsdl
+    -->
+    <!-- but with manual changes to introduce the JMS configuration -->
+
 <wsdl:definitions name="HelloWorldServiceService"
-    targetNamespace="http://helloworld/" xmlns:tns="http://helloworld/"
+    targetNamespace="http://helloworld/" xmlns="http://helloworld/"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
     <wsdl:types>
@@ -37,34 +44,43 @@
             <xs:element name="getGreetingsCBeanResponse"
                 type="tns:getGreetingsCBeanResponse" />
 
+            <xs:element name="getGreetingsDBean" type="tns:getGreetingsDBean" />
+            <xs:element name="getGreetingsDBeanResponse"
+                type="tns:getGreetingsDBeanResponse" />
             <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse" />
-            <xs:complexType name="getGreetingsBBeanResponse">
+            <xs:complexType name="getGreetingsBean">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="return"
-                        type="xs:string" />
+                    <xs:element minOccurs="0" name="arg0"
+                        type="ns1:aBean" />
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetingsCBeanResponse">
+            <xs:complexType name="getGreetingsBeanArrayResponse">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="return"
                         type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetingsBeanArrayResponse">
+            <xs:complexType name="getGreetingsBeanArray">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="return"
-                        type="xs:string" />
+                    <xs:element maxOccurs="unbounded"
+                        minOccurs="0" name="arg0" nillable="true" type="ns1:aBean" />
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetingsResponse">
+            <xs:complexType name="getGreetingsBBeanResponse">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="return"
                         type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetings">
+            <xs:complexType name="getGreetingsBBean">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="arg0"
+                        type="tns:bBean" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="getGreetingsCBeanResponse">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="return"
                         type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
@@ -74,10 +90,16 @@
                         type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetingsBean">
+            <xs:complexType name="getGreetings">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="arg0"
-                        type="ns1:aBean" />
+                        type="xs:string" />
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="getGreetingsResponse">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="return"
+                        type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="getGreetingsCBean">
@@ -94,16 +116,16 @@
                     </xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetingsBBean">
+            <xs:complexType name="getGreetingsDBean">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="arg0"
-                        type="tns:bBean" />
+                        type="dBean" />
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="getGreetingsBeanArray">
+            <xs:complexType name="getGreetingsDBeanResponse">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded"
-                        minOccurs="0" name="arg0" nillable="true" type="ns1:aBean" />
+                    <xs:element minOccurs="0" name="return"
+                        type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
 
@@ -115,11 +137,21 @@
                         type="xs:string" />
                 </xs:sequence>
             </xs:complexType>
+
+            <xs:complexType name="dBean">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="field1"
+                        type="xs:string" />
+                    <xs:element minOccurs="0" name="field2"
+                        type="xs:string" />
+                    <xs:element minOccurs="0" name="field3"
+                        type="bBean" />
+                </xs:sequence>
+            </xs:complexType>
         </xs:schema>
         <xs:schema targetNamespace="http://test" version="1.0"
             xmlns:__nnns="http://helloworld/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
             <xs:import namespace="http://helloworld/" />
-
             <xs:complexType name="aBean">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="field1"
@@ -133,87 +165,103 @@
         </xs:schema>
     </wsdl:types>
     <wsdl:message name="getGreetingsBean">
-        <wsdl:part name="getGreetingsBean" element="tns:getGreetingsBean">
+        <wsdl:part name="getGreetingsBean" element="getGreetingsBean">
+        </wsdl:part>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsDBean">
+        <wsdl:part name="getGreetingsDBean" element="getGreetingsDBean">
         </wsdl:part>
     </wsdl:message>
     <wsdl:message name="getGreetings">
-        <wsdl:part name="getGreetings" element="tns:getGreetings">
+        <wsdl:part name="getGreetings" element="getGreetings">
         </wsdl:part>
-
     </wsdl:message>
     <wsdl:message name="getGreetingsCBean">
-        <wsdl:part name="getGreetingsCBean" element="tns:getGreetingsCBean">
+
+        <wsdl:part name="getGreetingsCBean" element="getGreetingsCBean">
         </wsdl:part>
     </wsdl:message>
-    <wsdl:message name="getGreetingsCBeanResponse">
-        <wsdl:part name="getGreetingsCBeanResponse" element="tns:getGreetingsCBeanResponse">
+    <wsdl:message name="getGreetingsDBeanResponse">
+        <wsdl:part name="getGreetingsDBeanResponse" element="getGreetingsDBeanResponse">
         </wsdl:part>
     </wsdl:message>
+    <wsdl:message name="getGreetingsCBeanResponse">
+        <wsdl:part name="getGreetingsCBeanResponse" element="getGreetingsCBeanResponse">
 
+        </wsdl:part>
+    </wsdl:message>
     <wsdl:message name="getGreetingsBBean">
-        <wsdl:part name="getGreetingsBBean" element="tns:getGreetingsBBean">
+        <wsdl:part name="getGreetingsBBean" element="getGreetingsBBean">
         </wsdl:part>
     </wsdl:message>
     <wsdl:message name="getGreetingsResponse">
-        <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse">
+        <wsdl:part name="getGreetingsResponse" element="getGreetingsResponse">
         </wsdl:part>
+
     </wsdl:message>
     <wsdl:message name="getGreetingsBeanResponse">
-
-        <wsdl:part name="getGreetingsBeanResponse" element="tns:getGreetingsBeanResponse">
+        <wsdl:part name="getGreetingsBeanResponse" element="getGreetingsBeanResponse">
         </wsdl:part>
     </wsdl:message>
     <wsdl:message name="getGreetingsBeanArrayResponse">
         <wsdl:part name="getGreetingsBeanArrayResponse"
-            element="tns:getGreetingsBeanArrayResponse">
+            element="getGreetingsBeanArrayResponse">
         </wsdl:part>
     </wsdl:message>
-    <wsdl:message name="getGreetingsBBeanResponse">
-        <wsdl:part name="getGreetingsBBeanResponse" element="tns:getGreetingsBBeanResponse">
 
+    <wsdl:message name="getGreetingsBBeanResponse">
+        <wsdl:part name="getGreetingsBBeanResponse" element="getGreetingsBBeanResponse">
         </wsdl:part>
     </wsdl:message>
     <wsdl:message name="getGreetingsBeanArray">
-        <wsdl:part name="getGreetingsBeanArray" element="tns:getGreetingsBeanArray">
+        <wsdl:part name="getGreetingsBeanArray" element="getGreetingsBeanArray">
         </wsdl:part>
     </wsdl:message>
     <wsdl:portType name="HelloWorldService">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetings">
 
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="getGreetings">
             </wsdl:input>
-            <wsdl:output message="tns:getGreetingsResponse">
+            <wsdl:output message="getGreetingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsDBean">
+            <wsdl:input message="getGreetingsDBean">
+            </wsdl:input>
+
+            <wsdl:output message="getGreetingsDBeanResponse">
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="getGreetingsBean">
-            <wsdl:input message="tns:getGreetingsBean">
+            <wsdl:input message="getGreetingsBean">
             </wsdl:input>
-            <wsdl:output message="tns:getGreetingsBeanResponse">
+            <wsdl:output message="getGreetingsBeanResponse">
             </wsdl:output>
-
         </wsdl:operation>
+
         <wsdl:operation name="getGreetingsBeanArray">
-            <wsdl:input message="tns:getGreetingsBeanArray">
+            <wsdl:input message="getGreetingsBeanArray">
             </wsdl:input>
-            <wsdl:output message="tns:getGreetingsBeanArrayResponse">
+            <wsdl:output message="getGreetingsBeanArrayResponse">
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="getGreetingsBBean">
-            <wsdl:input message="tns:getGreetingsBBean">
-
+            <wsdl:input message="getGreetingsBBean">
             </wsdl:input>
-            <wsdl:output message="tns:getGreetingsBBeanResponse">
+
+            <wsdl:output message="getGreetingsBBeanResponse">
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="getGreetingsCBean">
-            <wsdl:input message="tns:getGreetingsCBean">
+            <wsdl:input message="getGreetingsCBean">
             </wsdl:input>
-            <wsdl:output message="tns:getGreetingsCBeanResponse">
+            <wsdl:output message="getGreetingsCBeanResponse">
             </wsdl:output>
-
         </wsdl:operation>
+
     </wsdl:portType>
-    <wsdl:binding name="HelloWorldJmsBinding" type="tns:HelloWorldService">
+    <wsdl:binding name="HelloWorldServiceBinding" type="HelloWorldService">
         <SOAP:binding style="document"
             transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="getGreetings">
@@ -221,8 +269,18 @@
             <wsdl:input>
                 <SOAP:body use="literal" />
             </wsdl:input>
+            <wsdl:output>
 
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getGreetingsDBean">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
             <wsdl:output>
+
                 <SOAP:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
@@ -231,8 +289,8 @@
             <wsdl:input>
                 <SOAP:body use="literal" />
             </wsdl:input>
-
             <wsdl:output>
+
                 <SOAP:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
@@ -241,8 +299,8 @@
             <wsdl:input>
                 <SOAP:body use="literal" />
             </wsdl:input>
-
             <wsdl:output>
+
                 <SOAP:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
@@ -251,8 +309,8 @@
             <wsdl:input>
                 <SOAP:body use="literal" />
             </wsdl:input>
-
             <wsdl:output>
+
                 <SOAP:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
@@ -261,16 +319,37 @@
             <wsdl:input>
                 <SOAP:body use="literal" />
             </wsdl:input>
+            <wsdl:output>
+
+                <SOAP:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    
+    <wsdl:binding name="HelloWorldJmsBinding" type="HelloWorldService">
+        <SOAP:binding style="document"
+            transport="http://schemas.xmlsoap.org/soap/jms" />
+        <wsdl:operation name="getGreetings">
+            <SOAP:operation />
+            <wsdl:input>
+                <SOAP:body use="literal" />
+            </wsdl:input>
 
             <wsdl:output>
                 <SOAP:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
+
     </wsdl:binding>
+
     <wsdl:service name="HelloWorldService">
-        <wsdl:port name="HelloWorldJmsPort" binding="tns:HelloWorldJmsBinding">
+        <wsdl:port name="HelloWorldJmsPort" binding="HelloWorldJmsBinding">
             <SOAP:address
                 location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:51293" />
         </wsdl:port>
+        <wsdl:port name="HelloWorldServicePort" binding="HelloWorldServiceBinding">
+            <SOAP:address
+                location="http://l3aw203:8085/HelloWorldServiceComponent1" />
+        </wsdl:port>
     </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>