axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r564235 [5/9] - in /webservices/axis2/branches/java/jaxws21: ./ legal/ modules/adb-codegen/src/org/apache/axis2/schema/template/ modules/adb/src/org/apache/axis2/databinding/utils/ modules/addressing/src/org/apache/axis2/handlers/addressing...
Date Thu, 09 Aug 2007 15:15:50 GMT
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Thu Aug  9 08:14:52 2007
@@ -17,84 +17,63 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-                  xmlns:ns0="http://arrays.data.complex.tempuri.org/xsd"
-                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-                  xmlns:ns1="http://complex.tempuri.org"
-                  xmlns:ns2="http://data.complex.tempuri.org/xsd"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-                  targetNamespace="http://complex.tempuri.org">
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ns0="http://arrays.data.complex.tempuri.org/xsd" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://complex.tempuri.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ns2="http://data.complex.tempuri.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://complex.tempuri.org">
     <wsdl:types>
-        <xs:schema xmlns:ax22="http://arrays.data.complex.tempuri.org/xsd"
-                   xmlns:ax24="http://data.complex.tempuri.org/xsd" attributeFormDefault="qualified"
-                   elementFormDefault="qualified"
-                   targetNamespace="http://arrays.data.complex.tempuri.org/xsd">
+        <xs:schema xmlns:ax22="http://arrays.data.complex.tempuri.org/xsd" xmlns:ax24="http://data.complex.tempuri.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://arrays.data.complex.tempuri.org/xsd">
             <xs:import namespace="http://data.complex.tempuri.org/xsd"/>
             <xs:complexType name="ArrayOfshort">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="_short" nillable="true"
-                                type="xs:short"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="_short" nillable="true" type="xs:short"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfPerson">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="person" nillable="true"
-                                type="ax24:Person"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="person" nillable="true" type="ax24:Person"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfArrayOfstring">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="arrayOfstring"
-                                nillable="true" type="ax22:ArrayOfstring"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="arrayOfstring" nillable="true" type="ax22:ArrayOfstring"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfstring">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="string" nillable="true"
-                                type="xs:string"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="string" nillable="true" type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfNullableOfdateTime">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="dateTime" nillable="true"
-                                type="xs:dateTime"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="dateTime" nillable="true" type="xs:dateTime"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfNullableOfdecimal">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="decimal" nillable="true"
-                                type="xs:decimal"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="decimal" nillable="true" type="xs:decimal"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfanyType">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="anyType" nillable="true"
-                                type="xs:anyType"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="anyType" nillable="true" type="xs:anyType"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="ArrayOfint">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="_int" nillable="true"
-                                type="xs:int"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="_int" nillable="true" type="xs:int"/>
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-        <xs:schema xmlns:ns="http://complex.tempuri.org" attributeFormDefault="qualified"
-                   elementFormDefault="qualified" targetNamespace="http://complex.tempuri.org">
+        <xs:schema xmlns:ns="http://complex.tempuri.org" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://complex.tempuri.org">
             <xs:element name="retBool">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inBool" nillable="true" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="inBool" type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retBoolResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -115,124 +94,119 @@
             <xs:element name="retByteArray">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inByteArray" nillable="true"
-                                    type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="inByteArray" nillable="true" type="xs:base64Binary"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByteArrayResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="xs:base64Binary"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:base64Binary"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDouble">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inDouble" nillable="true" type="xs:double"/>
+                        <xs:element minOccurs="0" name="inDouble" type="xs:double"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDoubleResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:double"/>
+                        <xs:element minOccurs="0" name="return" type="xs:double"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retFloat">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inFloat" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="inFloat" type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retFloatResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="return" type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retSingle">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inSingle" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="inSingle" type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retSingleResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:float"/>
+                        <xs:element minOccurs="0" name="return" type="xs:float"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retChar">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inChar" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="inChar" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retCharResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="return" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retInt">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inInt" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="inInt" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retIntResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="return" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUShort">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inUShort" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="inUShort" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUShortResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:int"/>
+                        <xs:element minOccurs="0" name="return" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retInts">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="inInt" nillable="true"
-                                    type="xs:int"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="inInt" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retIntsResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return"
-                                    nillable="true" type="xs:int"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" type="xs:int"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retObject">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inObject" nillable="true"
-                                    type="xs:anyType"/>
+                        <xs:element minOccurs="0" name="inObject" nillable="true" type="xs:anyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -246,8 +220,7 @@
             <xs:element name="retEnumInt">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inEnumInt" nillable="true"
-                                    type="xs:string"/>
+                        <xs:element minOccurs="0" name="inEnumInt" nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -303,24 +276,21 @@
             <xs:element name="retStrings">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="inString"
-                                    nillable="true" type="xs:string"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="inString" nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retStringsResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return"
-                                    nillable="true" type="xs:string"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDecimal">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inDecimal" nillable="true"
-                                    type="xs:decimal"/>
+                        <xs:element minOccurs="0" name="inDecimal" nillable="true" type="xs:decimal"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -348,8 +318,7 @@
             <xs:element name="retDateTime">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inDateTime" nillable="true"
-                                    type="xs:dateTime"/>
+                        <xs:element minOccurs="0" name="inDateTime" nillable="true" type="xs:dateTime"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -377,36 +346,35 @@
             <xs:element name="retLong">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inLong" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="inLong" type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retLongResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="return" type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUInt">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inUInt" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="inUInt" type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retUIntResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:long"/>
+                        <xs:element minOccurs="0" name="return" type="xs:long"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retEnumString">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inEnumString" nillable="true"
-                                    type="ns2:BitMask"/>
+                        <xs:element minOccurs="0" name="inEnumString" nillable="true" type="ns2:BitMask"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -420,40 +388,35 @@
             <xs:element name="retStructSNSA">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inStructSNSA" nillable="true"
-                                    type="ns2:Employee"/>
+                        <xs:element minOccurs="0" name="inStructSNSA" nillable="true" type="ns2:Employee"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retStructSNSAResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns2:Employee"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns2:Employee"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDerivedClass">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inDerivedClass" nillable="true"
-                                    type="ns2:Furniture"/>
+                        <xs:element minOccurs="0" name="inDerivedClass" nillable="true" type="ns2:Furniture"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retDerivedClassResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns2:Furniture"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns2:Furniture"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retStructSNSAS">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inStructSNSAS" nillable="true"
-                                    type="ns2:Group"/>
+                        <xs:element minOccurs="0" name="inStructSNSAS" nillable="true" type="ns2:Group"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -467,8 +430,7 @@
             <xs:element name="retStructS1">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inStructS1" nillable="true"
-                                    type="ns2:Name"/>
+                        <xs:element minOccurs="0" name="inStructS1" nillable="true" type="ns2:Name"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -482,8 +444,7 @@
             <xs:element name="retStructSN">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inStructSN" nillable="true"
-                                    type="ns2:Person"/>
+                        <xs:element minOccurs="0" name="inStructSN" nillable="true" type="ns2:Person"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -497,8 +458,7 @@
             <xs:element name="retDerivedClass2">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inDerivedClass" nillable="true"
-                                    type="ns2:Table"/>
+                        <xs:element minOccurs="0" name="inDerivedClass" nillable="true" type="ns2:Table"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
@@ -512,148 +472,131 @@
             <xs:element name="retArrayString2D">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArrayString2D" nillable="true"
-                                    type="ns0:ArrayOfArrayOfstring"/>
+                        <xs:element minOccurs="0" name="inArrayString2D" nillable="true" type="ns0:ArrayOfArrayOfstring"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayString2DResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfArrayOfstring"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfArrayOfstring"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayDateTime1D">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArrayDateTime1D" nillable="true"
-                                    type="ns0:ArrayOfNullableOfdateTime"/>
+                        <xs:element minOccurs="0" name="inArrayDateTime1D" nillable="true" type="ns0:ArrayOfNullableOfdateTime"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayDateTime1DResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfNullableOfdateTime"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfNullableOfdateTime"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayDecimal1D">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArrayDecimal1D" nillable="true"
-                                    type="ns0:ArrayOfNullableOfdecimal"/>
+                        <xs:element minOccurs="0" name="inArrayDecimal1D" nillable="true" type="ns0:ArrayOfNullableOfdecimal"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayDecimal1DResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfNullableOfdecimal"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfNullableOfdecimal"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArray1DSN">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArray1DSN" nillable="true"
-                                    type="ns0:ArrayOfPerson"/>
+                        <xs:element minOccurs="0" name="inArray1DSN" nillable="true" type="ns0:ArrayOfPerson"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArray1DSNResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfPerson"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfPerson"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayAnyType1D">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArrayAnyType1D" nillable="true"
-                                    type="ns0:ArrayOfanyType"/>
+                        <xs:element minOccurs="0" name="inArrayAnyType1D" nillable="true" type="ns0:ArrayOfanyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayAnyType1DResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfanyType"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfanyType"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayInt1D">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArrayInt1D" nillable="true"
-                                    type="ns0:ArrayOfint"/>
+                        <xs:element minOccurs="0" name="inArrayInt1D" nillable="true" type="ns0:ArrayOfint"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayInt1DResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfint"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfint"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayString1D">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inArrayString1D" nillable="true"
-                                    type="ns0:ArrayOfstring"/>
+                        <xs:element minOccurs="0" name="inArrayString1D" nillable="true" type="ns0:ArrayOfstring"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retArrayString1DResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true"
-                                    type="ns0:ArrayOfstring"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ns0:ArrayOfstring"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByte">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inByte" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="inByte" type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retByteResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="return" type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retShort">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="inShort" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="inShort" type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="retShortResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:short"/>
+                        <xs:element minOccurs="0" name="return" type="xs:short"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
         </xs:schema>
-        <xs:schema xmlns:ax23="http://arrays.data.complex.tempuri.org/xsd"
-                   xmlns:ax21="http://data.complex.tempuri.org/xsd" attributeFormDefault="qualified"
-                   elementFormDefault="qualified"
-                   targetNamespace="http://data.complex.tempuri.org/xsd">
+        <xs:schema xmlns:ax23="http://arrays.data.complex.tempuri.org/xsd" xmlns:ax21="http://data.complex.tempuri.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://data.complex.tempuri.org/xsd">
             <xs:import namespace="http://arrays.data.complex.tempuri.org/xsd"/>
             <xs:complexType name="BitMask">
                 <xs:sequence>
@@ -669,8 +612,7 @@
                     <xs:element minOccurs="0" name="baseDetails" nillable="true" type="ns2:Person"/>
                     <xs:element minOccurs="0" name="hireDate" nillable="true" type="xs:dateTime"/>
                     <xs:element minOccurs="0" name="jobID" nillable="true" type="xs:long"/>
-                    <xs:element minOccurs="0" name="numbers" nillable="true"
-                                type="ax23:ArrayOfshort"/>
+                    <xs:element minOccurs="0" name="numbers" nillable="true" type="ax23:ArrayOfshort"/>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="Person">
@@ -689,8 +631,7 @@
             </xs:complexType>
             <xs:complexType name="Group">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="members" nillable="true"
-                                type="ax23:ArrayOfPerson"/>
+                    <xs:element minOccurs="0" name="members" nillable="true" type="ax23:ArrayOfPerson"/>
                     <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
@@ -703,8 +644,7 @@
                 <xs:complexContent>
                     <xs:extension base="ns2:Furniture">
                         <xs:sequence>
-                            <xs:element minOccurs="0" name="seatingCapacity" nillable="true"
-                                        type="xs:int"/>
+                            <xs:element minOccurs="0" name="seatingCapacity" nillable="true" type="xs:int"/>
                         </xs:sequence>
                     </xs:extension>
                 </xs:complexContent>
@@ -941,244 +881,156 @@
     </wsdl:message>
     <wsdl:portType name="ComplexDataTypesPortType">
         <wsdl:operation name="retStructSNSAS">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retStructSNSASRequest" wsaw:Action="urn:retStructSNSAS"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retStructSNSASResponse"
-                         wsaw:Action="urn:retStructSNSASResponse"/>
+            <wsdl:input message="ns1:retStructSNSASRequest" wsaw:Action="urn:retStructSNSAS"/>
+            <wsdl:output message="ns1:retStructSNSASResponse" wsaw:Action="urn:retStructSNSASResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retSingle">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retSingleRequest" wsaw:Action="urn:retSingle"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retSingleResponse" wsaw:Action="urn:retSingleResponse"/>
+            <wsdl:input message="ns1:retSingleRequest" wsaw:Action="urn:retSingle"/>
+            <wsdl:output message="ns1:retSingleResponse" wsaw:Action="urn:retSingleResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArrayString2D">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArrayString2DRequest" wsaw:Action="urn:retArrayString2D"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArrayString2DResponse"
-                         wsaw:Action="urn:retArrayString2DResponse"/>
+            <wsdl:input message="ns1:retArrayString2DRequest" wsaw:Action="urn:retArrayString2D"/>
+            <wsdl:output message="ns1:retArrayString2DResponse" wsaw:Action="urn:retArrayString2DResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArrayAnyType1D">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArrayAnyType1DRequest" wsaw:Action="urn:retArrayAnyType1D"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArrayAnyType1DResponse"
-                         wsaw:Action="urn:retArrayAnyType1DResponse"/>
+            <wsdl:input message="ns1:retArrayAnyType1DRequest" wsaw:Action="urn:retArrayAnyType1D"/>
+            <wsdl:output message="ns1:retArrayAnyType1DResponse" wsaw:Action="urn:retArrayAnyType1DResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retInts">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retIntsRequest" wsaw:Action="urn:retInts"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retIntsResponse" wsaw:Action="urn:retIntsResponse"/>
+            <wsdl:input message="ns1:retIntsRequest" wsaw:Action="urn:retInts"/>
+            <wsdl:output message="ns1:retIntsResponse" wsaw:Action="urn:retIntsResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retDateTime">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retDateTimeRequest" wsaw:Action="urn:retDateTime"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retDateTimeResponse" wsaw:Action="urn:retDateTimeResponse"/>
+            <wsdl:input message="ns1:retDateTimeRequest" wsaw:Action="urn:retDateTime"/>
+            <wsdl:output message="ns1:retDateTimeResponse" wsaw:Action="urn:retDateTimeResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retStructSNSA">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retStructSNSARequest" wsaw:Action="urn:retStructSNSA"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retStructSNSAResponse"
-                         wsaw:Action="urn:retStructSNSAResponse"/>
+            <wsdl:input message="ns1:retStructSNSARequest" wsaw:Action="urn:retStructSNSA"/>
+            <wsdl:output message="ns1:retStructSNSAResponse" wsaw:Action="urn:retStructSNSAResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retGuid">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retGuidRequest" wsaw:Action="urn:retGuid"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retGuidResponse" wsaw:Action="urn:retGuidResponse"/>
+            <wsdl:input message="ns1:retGuidRequest" wsaw:Action="urn:retGuid"/>
+            <wsdl:output message="ns1:retGuidResponse" wsaw:Action="urn:retGuidResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retByteArray">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retByteArrayRequest" wsaw:Action="urn:retByteArray"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retByteArrayResponse" wsaw:Action="urn:retByteArrayResponse"/>
+            <wsdl:input message="ns1:retByteArrayRequest" wsaw:Action="urn:retByteArray"/>
+            <wsdl:output message="ns1:retByteArrayResponse" wsaw:Action="urn:retByteArrayResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retDerivedClass2">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retDerivedClass2Request" wsaw:Action="urn:retDerivedClass2"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retDerivedClass2Response"
-                         wsaw:Action="urn:retDerivedClass2Response"/>
+            <wsdl:input message="ns1:retDerivedClass2Request" wsaw:Action="urn:retDerivedClass2"/>
+            <wsdl:output message="ns1:retDerivedClass2Response" wsaw:Action="urn:retDerivedClass2Response"/>
         </wsdl:operation>
         <wsdl:operation name="retUri">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retUriRequest" wsaw:Action="urn:retUri"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retUriResponse" wsaw:Action="urn:retUriResponse"/>
+            <wsdl:input message="ns1:retUriRequest" wsaw:Action="urn:retUri"/>
+            <wsdl:output message="ns1:retUriResponse" wsaw:Action="urn:retUriResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retQName">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retQNameRequest" wsaw:Action="urn:retQName"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retQNameResponse" wsaw:Action="urn:retQNameResponse"/>
+            <wsdl:input message="ns1:retQNameRequest" wsaw:Action="urn:retQName"/>
+            <wsdl:output message="ns1:retQNameResponse" wsaw:Action="urn:retQNameResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArray1DSN">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArray1DSNRequest" wsaw:Action="urn:retArray1DSN"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArray1DSNResponse" wsaw:Action="urn:retArray1DSNResponse"/>
+            <wsdl:input message="ns1:retArray1DSNRequest" wsaw:Action="urn:retArray1DSN"/>
+            <wsdl:output message="ns1:retArray1DSNResponse" wsaw:Action="urn:retArray1DSNResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retStrings">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retStringsRequest" wsaw:Action="urn:retStrings"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retStringsResponse" wsaw:Action="urn:retStringsResponse"/>
+            <wsdl:input message="ns1:retStringsRequest" wsaw:Action="urn:retStrings"/>
+            <wsdl:output message="ns1:retStringsResponse" wsaw:Action="urn:retStringsResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retEnumInt">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retEnumIntRequest" wsaw:Action="urn:retEnumInt"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retEnumIntResponse" wsaw:Action="urn:retEnumIntResponse"/>
+            <wsdl:input message="ns1:retEnumIntRequest" wsaw:Action="urn:retEnumInt"/>
+            <wsdl:output message="ns1:retEnumIntResponse" wsaw:Action="urn:retEnumIntResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retLong">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retLongRequest" wsaw:Action="urn:retLong"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retLongResponse" wsaw:Action="urn:retLongResponse"/>
+            <wsdl:input message="ns1:retLongRequest" wsaw:Action="urn:retLong"/>
+            <wsdl:output message="ns1:retLongResponse" wsaw:Action="urn:retLongResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retUShort">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retUShortRequest" wsaw:Action="urn:retUShort"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retUShortResponse" wsaw:Action="urn:retUShortResponse"/>
+            <wsdl:input message="ns1:retUShortRequest" wsaw:Action="urn:retUShort"/>
+            <wsdl:output message="ns1:retUShortResponse" wsaw:Action="urn:retUShortResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArrayString1D">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArrayString1DRequest" wsaw:Action="urn:retArrayString1D"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArrayString1DResponse"
-                         wsaw:Action="urn:retArrayString1DResponse"/>
+            <wsdl:input message="ns1:retArrayString1DRequest" wsaw:Action="urn:retArrayString1D"/>
+            <wsdl:output message="ns1:retArrayString1DResponse" wsaw:Action="urn:retArrayString1DResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArrayInt1D">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArrayInt1DRequest" wsaw:Action="urn:retArrayInt1D"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArrayInt1DResponse"
-                         wsaw:Action="urn:retArrayInt1DResponse"/>
+            <wsdl:input message="ns1:retArrayInt1DRequest" wsaw:Action="urn:retArrayInt1D"/>
+            <wsdl:output message="ns1:retArrayInt1DResponse" wsaw:Action="urn:retArrayInt1DResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArrayDateTime1D">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArrayDateTime1DRequest"
-                        wsaw:Action="urn:retArrayDateTime1D"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArrayDateTime1DResponse"
-                         wsaw:Action="urn:retArrayDateTime1DResponse"/>
+            <wsdl:input message="ns1:retArrayDateTime1DRequest" wsaw:Action="urn:retArrayDateTime1D"/>
+            <wsdl:output message="ns1:retArrayDateTime1DResponse" wsaw:Action="urn:retArrayDateTime1DResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retUInt">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retUIntRequest" wsaw:Action="urn:retUInt"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retUIntResponse" wsaw:Action="urn:retUIntResponse"/>
+            <wsdl:input message="ns1:retUIntRequest" wsaw:Action="urn:retUInt"/>
+            <wsdl:output message="ns1:retUIntResponse" wsaw:Action="urn:retUIntResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retArrayDecimal1D">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retArrayDecimal1DRequest" wsaw:Action="urn:retArrayDecimal1D"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retArrayDecimal1DResponse"
-                         wsaw:Action="urn:retArrayDecimal1DResponse"/>
+            <wsdl:input message="ns1:retArrayDecimal1DRequest" wsaw:Action="urn:retArrayDecimal1D"/>
+            <wsdl:output message="ns1:retArrayDecimal1DResponse" wsaw:Action="urn:retArrayDecimal1DResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retByte">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retByteRequest" wsaw:Action="urn:retByte"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retByteResponse" wsaw:Action="urn:retByteResponse"/>
+            <wsdl:input message="ns1:retByteRequest" wsaw:Action="urn:retByte"/>
+            <wsdl:output message="ns1:retByteResponse" wsaw:Action="urn:retByteResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retSByte">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retSByteRequest" wsaw:Action="urn:retSByte"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retSByteResponse" wsaw:Action="urn:retSByteResponse"/>
+            <wsdl:input message="ns1:retSByteRequest" wsaw:Action="urn:retSByte"/>
+            <wsdl:output message="ns1:retSByteResponse" wsaw:Action="urn:retSByteResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retShort">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retShortRequest" wsaw:Action="urn:retShort"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retShortResponse" wsaw:Action="urn:retShortResponse"/>
+            <wsdl:input message="ns1:retShortRequest" wsaw:Action="urn:retShort"/>
+            <wsdl:output message="ns1:retShortResponse" wsaw:Action="urn:retShortResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retStructSN">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retStructSNRequest" wsaw:Action="urn:retStructSN"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retStructSNResponse" wsaw:Action="urn:retStructSNResponse"/>
+            <wsdl:input message="ns1:retStructSNRequest" wsaw:Action="urn:retStructSN"/>
+            <wsdl:output message="ns1:retStructSNResponse" wsaw:Action="urn:retStructSNResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retObject">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retObjectRequest" wsaw:Action="urn:retObject"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retObjectResponse" wsaw:Action="urn:retObjectResponse"/>
+            <wsdl:input message="ns1:retObjectRequest" wsaw:Action="urn:retObject"/>
+            <wsdl:output message="ns1:retObjectResponse" wsaw:Action="urn:retObjectResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retFloat">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retFloatRequest" wsaw:Action="urn:retFloat"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retFloatResponse" wsaw:Action="urn:retFloatResponse"/>
+            <wsdl:input message="ns1:retFloatRequest" wsaw:Action="urn:retFloat"/>
+            <wsdl:output message="ns1:retFloatResponse" wsaw:Action="urn:retFloatResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retDouble">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retDoubleRequest" wsaw:Action="urn:retDouble"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retDoubleResponse" wsaw:Action="urn:retDoubleResponse"/>
+            <wsdl:input message="ns1:retDoubleRequest" wsaw:Action="urn:retDouble"/>
+            <wsdl:output message="ns1:retDoubleResponse" wsaw:Action="urn:retDoubleResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retBool">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retBoolRequest" wsaw:Action="urn:retBool"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retBoolResponse" wsaw:Action="urn:retBoolResponse"/>
+            <wsdl:input message="ns1:retBoolRequest" wsaw:Action="urn:retBool"/>
+            <wsdl:output message="ns1:retBoolResponse" wsaw:Action="urn:retBoolResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retDerivedClass">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retDerivedClassRequest" wsaw:Action="urn:retDerivedClass"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retDerivedClassResponse"
-                         wsaw:Action="urn:retDerivedClassResponse"/>
+            <wsdl:input message="ns1:retDerivedClassRequest" wsaw:Action="urn:retDerivedClass"/>
+            <wsdl:output message="ns1:retDerivedClassResponse" wsaw:Action="urn:retDerivedClassResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retDecimal">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retDecimalRequest" wsaw:Action="urn:retDecimal"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retDecimalResponse" wsaw:Action="urn:retDecimalResponse"/>
+            <wsdl:input message="ns1:retDecimalRequest" wsaw:Action="urn:retDecimal"/>
+            <wsdl:output message="ns1:retDecimalResponse" wsaw:Action="urn:retDecimalResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retEnumString">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retEnumStringRequest" wsaw:Action="urn:retEnumString"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retEnumStringResponse"
-                         wsaw:Action="urn:retEnumStringResponse"/>
+            <wsdl:input message="ns1:retEnumStringRequest" wsaw:Action="urn:retEnumString"/>
+            <wsdl:output message="ns1:retEnumStringResponse" wsaw:Action="urn:retEnumStringResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retStructS1">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retStructS1Request" wsaw:Action="urn:retStructS1"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retStructS1Response" wsaw:Action="urn:retStructS1Response"/>
+            <wsdl:input message="ns1:retStructS1Request" wsaw:Action="urn:retStructS1"/>
+            <wsdl:output message="ns1:retStructS1Response" wsaw:Action="urn:retStructS1Response"/>
         </wsdl:operation>
         <wsdl:operation name="retInt">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retIntRequest" wsaw:Action="urn:retInt"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retIntResponse" wsaw:Action="urn:retIntResponse"/>
+            <wsdl:input message="ns1:retIntRequest" wsaw:Action="urn:retInt"/>
+            <wsdl:output message="ns1:retIntResponse" wsaw:Action="urn:retIntResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retChar">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retCharRequest" wsaw:Action="urn:retChar"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retCharResponse" wsaw:Action="urn:retCharResponse"/>
+            <wsdl:input message="ns1:retCharRequest" wsaw:Action="urn:retChar"/>
+            <wsdl:output message="ns1:retCharResponse" wsaw:Action="urn:retCharResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retString">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retStringRequest" wsaw:Action="urn:retString"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retStringResponse" wsaw:Action="urn:retStringResponse"/>
+            <wsdl:input message="ns1:retStringRequest" wsaw:Action="urn:retString"/>
+            <wsdl:output message="ns1:retStringResponse" wsaw:Action="urn:retStringResponse"/>
         </wsdl:operation>
         <wsdl:operation name="retULong">
-            <wsdl:input xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                        message="ns1:retULongRequest" wsaw:Action="urn:retULong"/>
-            <wsdl:output xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                         message="ns1:retULongResponse" wsaw:Action="urn:retULongResponse"/>
+            <wsdl:input message="ns1:retULongRequest" wsaw:Action="urn:retULong"/>
+            <wsdl:output message="ns1:retULongResponse" wsaw:Action="urn:retULongResponse"/>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="ComplexDataTypesSOAP11Binding" type="ns1:ComplexDataTypesPortType">
@@ -2217,12 +2069,10 @@
         </wsdl:operation>
     </wsdl:binding>
     <wsdl:service name="ComplexDataTypes">
-        <wsdl:port name="ComplexDataTypesSOAP11port_http"
-                   binding="ns1:ComplexDataTypesSOAP11Binding">
+        <wsdl:port name="ComplexDataTypesSOAP11port_http" binding="ns1:ComplexDataTypesSOAP11Binding">
             <soap:address location="http://localhost:8080/axis2/services/ComplexDataTypes"/>
         </wsdl:port>
-        <wsdl:port name="ComplexDataTypesSOAP12port_http"
-                   binding="ns1:ComplexDataTypesSOAP12Binding">
+        <wsdl:port name="ComplexDataTypesSOAP12port_http" binding="ns1:ComplexDataTypesSOAP12Binding">
             <soap12:address location="http://localhost:8080/axis2/services/ComplexDataTypes"/>
         </wsdl:port>
         <wsdl:port name="ComplexDataTypesHttpport" binding="ns1:ComplexDataTypesHttpBinding">
@@ -2230,3 +2080,4 @@
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
+

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxbri/pom.xml?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxbri/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxbri/pom.xml Thu Aug  9 08:14:52 2007
@@ -99,6 +99,8 @@
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <tasks>
+                                <property name="axis2.home" value="${basedir}/target"/>
+                                <property name="maven.class.path" refid="maven.runtime.classpath"/>
                                 <!-- Theres got to be a better way to do this -->
                                 <property name="schema.source.dir" value="test-resources/xsd"/>
                                 <property name="wsdl.source.dir" value="test-resources/wsdl"/>
@@ -117,17 +119,13 @@
                                     <classpath location="${compiled.classes.dir}"/>
                                     <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/DocLitBareService.wsdl"/>
                                 </java>
-                                <echo>Generating Service Client for Test01 test</echo>
+                                <echo>Generating Service / Service Client for Test01 test</echo>
 								<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
 									<classpath refid="maven.runtime.classpath"/>
 									<classpath location="${compiled.classes.dir}"/>
-									<arg line="-d jaxbri -o target/wsdl/Test01 -u -uri ${wsdl.source.dir}/Test01.wsdl"/>
+									<arg line="-d jaxbri -ss -sd -t -o target/wsdl/Test01 -u -uri ${wsdl.source.dir}/Test01.wsdl"/>
 								</java>
-								<javac fork="true" destdir="${schema.generated.src.dir}" debug="on">
-									<classpath refid="maven.runtime.classpath"/>
-									<classpath location="${compiled.classes.dir}"/>
-									<src path="target/wsdl/Test01"/>
-								</javac>
+								<ant dir="target/wsdl/Test01"/>
                             </tasks>
                         </configuration>
                         <goals>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java?view=diff&rev=564235&r1=564234&r2=564235
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java Thu Aug  9 08:14:52 2007
@@ -26,33 +26,46 @@
 import com.sun.tools.xjc.api.S2JJAXBModel;
 import com.sun.tools.xjc.api.SchemaCompiler;
 import com.sun.tools.xjc.api.XJC;
-import com.sun.tools.xjc.api.impl.s2j.SchemaCompilerImpl;
+import com.sun.tools.xjc.api.Property;
 import org.apache.axis2.util.SchemaUtil;
 import org.apache.axis2.util.URLProcessor;
+import org.apache.axis2.util.XMLUtils;
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
 import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
 import org.apache.axis2.wsdl.databinding.TypeMapper;
+import org.apache.axis2.wsdl.WSDLUtil;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.util.Constants;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisOperation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.commons.schema.XmlSchema;
-import org.w3c.dom.Element;
 import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
+import org.w3c.dom.Element;
 import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.StringReader;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ArrayList;
 
 public class CodeGenerationUtility {
     private static final Log log = LogFactory.getLog(CodeGenerationUtility.class);
@@ -114,36 +127,45 @@
                 SchemaCompiler sc = XJC.createSchemaCompiler();
                 XmlSchema schema = (XmlSchema)schemas.get(i);
 
-                String pkg = null;
                 if (nsMap != null) {
-                    pkg = (String)nsMap.get(schema.getTargetNamespace());
-                }
-                if (pkg == null) {
-                    pkg = extractNamespace(schema);
+                    Iterator iterator = nsMap.entrySet().iterator();
+                    while(iterator.hasNext()){
+                        Map.Entry entry = (Map.Entry) iterator.next();
+                        String namespace = (String) entry.getKey();
+                        String pkg = (String)nsMap.get(namespace);
+                        registerNamespace(sc, namespace, pkg);
+                    }
+                } else {
+                    String namespace = schema.getTargetNamespace();
+                    String pkg = extractNamespace(schema);
+                    registerNamespace(sc, namespace, pkg);
                 }
-                sc.setDefaultPackageName(pkg);
 
                 sc.setEntityResolver(resolver);
 
                 sc.setErrorListener(new ErrorListener(){
                     public void error(SAXParseException saxParseException) {
+                        log.error(saxParseException.getMessage());
                         log.debug(saxParseException.getMessage(), saxParseException);
                     }
 
                     public void fatalError(SAXParseException saxParseException) {
+                        log.error(saxParseException.getMessage());
                         log.debug(saxParseException.getMessage(), saxParseException);
                     }
 
                     public void warning(SAXParseException saxParseException) {
+                        log.warn(saxParseException.getMessage());
                         log.debug(saxParseException.getMessage(), saxParseException);
                     }
 
                     public void info(SAXParseException saxParseException) {
+                        log.info(saxParseException.getMessage());
                         log.debug(saxParseException.getMessage(), saxParseException);
                     }
                 });
-                Document document = schema.getAllSchemas()[0];
-                sc.parseSchema(schema.getTargetNamespace(), document.getDocumentElement());
+
+                sc.parseSchema((InputSource) xmlObjectsVector.get(i));
 
                 // Bind the XML
                 S2JJAXBModel jaxbModel = sc.bind();
@@ -168,6 +190,89 @@
 
                     mapper.addTypeMappingName(qn, typeName);
                 }
+
+                //process the unwrapped parameters
+                if (!cgconfig.isParametersWrapped()) {
+                    //figure out the unwrapped operations
+                    List axisServices = cgconfig.getAxisServices();
+                    for (Iterator servicesIter = axisServices.iterator(); servicesIter.hasNext();) {
+                        AxisService axisService = (AxisService)servicesIter.next();
+                        for (Iterator operations = axisService.getOperations();
+                             operations.hasNext();) {
+                            AxisOperation op = (AxisOperation)operations.next();
+
+                            if (WSDLUtil.isInputPresentForMEP(op.getMessageExchangePattern())) {
+                                AxisMessage message = op.getMessage(
+                                        WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+                                if (message != null &&
+                                        message.getParameter(Constants.UNWRAPPED_KEY) != null) {
+
+                                    Mapping mapping = jaxbModel.get(message.getElementQName());
+                                    List elementProperties = mapping.getWrapperStyleDrilldown();
+                                    for(int j = 0; j < elementProperties.size(); j++){
+                                        Property elementProperty = (Property) elementProperties.get(j);
+
+                                        QName partQName =
+                                                    WSDLUtil.getPartQName(op.getName().getLocalPart(),
+                                                                          WSDLConstants.INPUT_PART_QNAME_SUFFIX,
+                                                                          elementProperty.elementName().getLocalPart());
+                                        //this type is based on a primitive type- use the
+                                        //primitive type name in this case
+                                        String fullJaveName =
+                                                elementProperty.type().fullName();
+                                        if (elementProperty.type().isArray()) {
+                                            fullJaveName = fullJaveName.concat("[]");
+                                        }
+                                        mapper.addTypeMappingName(partQName, fullJaveName);
+
+                                        if (elementProperty.type().isPrimitive()) {
+                                            mapper.addTypeMappingStatus(partQName, Boolean.TRUE);
+                                        }
+                                        if (elementProperty.type().isArray()) {
+                                            mapper.addTypeMappingStatus(partQName,
+                                                                        Constants.ARRAY_TYPE);
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (WSDLUtil.isOutputPresentForMEP(op.getMessageExchangePattern())) {
+                                AxisMessage message = op.getMessage(
+                                        WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+                                if (message != null &&
+                                        message.getParameter(Constants.UNWRAPPED_KEY) != null) {
+
+                                    Mapping mapping = jaxbModel.get(message.getElementQName());
+                                    List elementProperties = mapping.getWrapperStyleDrilldown();
+                                    for(int j = 0; j < elementProperties.size(); j++){
+                                        Property elementProperty = (Property) elementProperties.get(j);
+
+                                        QName partQName =
+                                                    WSDLUtil.getPartQName(op.getName().getLocalPart(),
+                                                                          WSDLConstants.OUTPUT_PART_QNAME_SUFFIX,
+                                                                          elementProperty.elementName().getLocalPart());
+                                        //this type is based on a primitive type- use the
+                                        //primitive type name in this case
+                                        String fullJaveName =
+                                                elementProperty.type().fullName();
+                                        if (elementProperty.type().isArray()) {
+                                            fullJaveName = fullJaveName.concat("[]");
+                                        }
+                                        mapper.addTypeMappingName(partQName, fullJaveName);
+
+                                        if (elementProperty.type().isPrimitive()) {
+                                            mapper.addTypeMappingStatus(partQName, Boolean.TRUE);
+                                        }
+                                        if (elementProperty.type().isArray()) {
+                                            mapper.addTypeMappingStatus(partQName,
+                                                                        Constants.ARRAY_TYPE);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
             // Return the type mapper
@@ -176,6 +281,38 @@
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+    }
+
+    private static void registerNamespace(SchemaCompiler sc, String namespace, String pkgName) throws Exception {
+        Document doc = XMLUtils.newDocument();
+        Element rootElement = doc.createElement("schema");
+        rootElement.setAttribute("xmlns", "http://www.w3.org/2001/XMLSchema");
+        rootElement.setAttribute("xmlns:jaxb", "http://java.sun.com/xml/ns/jaxb");
+        rootElement.setAttribute("jaxb:version", "2.0");
+        rootElement.setAttribute("targetNamespace", namespace);
+        Element annoElement = doc.createElement("annotation");
+        Element appInfo = doc.createElement("appinfo");
+        Element schemaBindings = doc.createElement("jaxb:schemaBindings");
+        Element pkgElement = doc.createElement("jaxb:package");
+        pkgElement.setAttribute("name", pkgName);
+        annoElement.appendChild(appInfo);
+        appInfo.appendChild(schemaBindings);
+        schemaBindings.appendChild(pkgElement);
+        rootElement.appendChild(annoElement);
+        File file = File.createTempFile("customized",".xsd");
+        FileOutputStream stream = new FileOutputStream(file);
+        try {
+            Result result = new StreamResult(stream);
+            Transformer xformer = TransformerFactory.newInstance().newTransformer();
+            xformer.transform(new DOMSource(rootElement), result);
+            stream.flush();
+            stream.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        InputSource ins = new InputSource(file.toURI().toString());
+        sc.parseSchema(ins);
+        file.delete();
     }
 
     private static String extractNamespace(XmlSchema schema) {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message