You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by aj...@apache.org on 2005/09/13 10:43:32 UTC

svn commit: r280518 - in /webservices/axis2/trunk/java/modules/wsdl: test-resources/complex-doc-literal.wsdl test-resources/dime-doc.wsdl test-resources/mime-doc.wsdl test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java

Author: ajith
Date: Tue Sep 13 01:43:15 2005
New Revision: 280518

URL: http://svn.apache.org/viewcvs?rev=280518&view=rev
Log:
Added  more tests for the code generator (using the  Axis1 test suite). However the Axis1 test base needs to be closely combed to find all the doc/lit samples

Added:
    webservices/axis2/trunk/java/modules/wsdl/test-resources/dime-doc.wsdl
    webservices/axis2/trunk/java/modules/wsdl/test-resources/mime-doc.wsdl
Modified:
    webservices/axis2/trunk/java/modules/wsdl/test-resources/complex-doc-literal.wsdl
    webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java

Modified: webservices/axis2/trunk/java/modules/wsdl/test-resources/complex-doc-literal.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test-resources/complex-doc-literal.wsdl?rev=280518&r1=280517&r2=280518&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test-resources/complex-doc-literal.wsdl (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test-resources/complex-doc-literal.wsdl Tue Sep 13 01:43:15 2005
@@ -1,329 +1,329 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://soapinterop.org/wsdl"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:ns2="http://soapinterop.org/types"
-    xmlns:ns3="http://soapinterop.org/types/part"
-    xmlns:ns4="http://soapinterop.org/types/requestresponse"
-    targetNamespace="http://soapinterop.org/wsdl">
-
-    <types>
-        <schema
-            xmlns="http://www.w3.org/2001/XMLSchema"
-            xmlns:tns="http://soapinterop.org/types"
-            targetNamespace="http://soapinterop.org/types">
-
-            <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-            <complexType name="SOAPStruct">
-                <sequence>
-                    <element name="varString" type="xsd:string"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varFloat" type="xsd:float"/>
-                </sequence>
-            </complexType>
-
-            <complexType name="SOAPStructFault">
-                <sequence>
-                    <element name="soapStruct" type="tns:SOAPStruct"/>
-                </sequence>
-            </complexType>
-
-            <complexType name="BaseStruct">
-                <sequence>
-                    <element name="structMessage" type="tns:SOAPStruct"/>
-                    <element name="shortMessage" type="xsd:short"/>
-                </sequence>
-            </complexType>
-
-            <complexType name="ExtendedStruct">
-                <complexContent>
-                    <extension base="tns:BaseStruct">
-                        <sequence>
-                            <element name="stringMessage" type="xsd:string"/>
-                            <element name="intMessage" type="xsd:int"/>
-                            <element name="anotherIntMessage" type="xsd:int"/>
-                        </sequence>
-                    </extension>
-                </complexContent>
-            </complexType>
-
-            <complexType name="MoreExtendedStruct">
-                <complexContent>
-                    <extension base="tns:ExtendedStruct">
-                        <sequence>
-                            <element name="booleanMessage" type="xsd:boolean"/>
-                        </sequence>
-                    </extension>
-                </complexContent>
-            </complexType>
-
-        </schema>
-
-        <schema
-            xmlns="http://www.w3.org/2001/XMLSchema"
-            xmlns:tns="http://soapinterop.org/types/part"
-            targetNamespace="http://soapinterop.org/types/part">
-
-            <element name="SOAPStructFaultPart" type="ns2:SOAPStructFault"/>
-            <element name="BaseStructPart" type="ns2:BaseStruct"/>
-            <element name="ExtendedStructPart" type="ns2:ExtendedStruct"/>
-            <element name="MoreExtendedStructPart" type="ns2:MoreExtendedStruct"/>
-
-        </schema>
-
-        <schema
-            xmlns="http://www.w3.org/2001/XMLSchema"
-            xmlns:tns="http://soapinterop.org/types/requestresponse"
-            targetNamespace="http://soapinterop.org/types/requestresponse">
-
-            <element name="echoSOAPStructFaultRequest" type="ns2:SOAPStruct"/>
-            <element name="echoSOAPStructFaultResponse">
-                <complexType/>
-            </element>
-
-            <element name="echoBaseStructFaultRequest" type="ns2:BaseStruct"/>
-            <element name="echoBaseStructFaultResponse">
-                <complexType/>
-            </element>
-
-            <element name="echoExtendedStructFaultRequest" type="ns2:ExtendedStruct"/>
-            <element name="echoExtendedStructFaultResponse">
-                <complexType/>
-            </element>
-
-            <element name="echoMultipleFaults1Request">
-                <complexType>
-                    <sequence>
-                        <element name="whichFault" type="xsd:int"/>
-                        <element name="param1" type="ns2:SOAPStruct"/>
-                        <element name="param2" type="ns2:BaseStruct"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoMultipleFaults1Response">
-                <complexType/>
-            </element>
-
-            <element name="echoMultipleFaults2Request">
-                <complexType>
-                    <sequence>
-                        <element name="whichFault" type="xsd:int"/>
-                        <element name="param1" type="ns2:BaseStruct"/>
-                        <element name="param2" type="ns2:ExtendedStruct"/>
-                        <element name="param3" type="ns2:MoreExtendedStruct"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="echoMultipleFaults2Response">
-                <complexType/>
-            </element>
-
-        </schema>
-    </types>
-
-    <message name="echoSOAPStructFaultRequest">
-        <part name="param" element="ns4:echoSOAPStructFaultRequest"/>
-    </message>
-    <message name="echoSOAPStructFaultResponse">
-        <part name="param" element="ns4:echoSOAPStructFaultResponse"/>
-    </message>
-
-    <message name="echoBaseStructFaultRequest">
-        <part name="param" element="ns4:echoBaseStructFaultRequest"/>
-    </message>
-    <message name="echoBaseStructFaultResponse">
-        <part name="param" element="ns4:echoBaseStructFaultResponse"/>
-    </message>
-
-    <message name="echoExtendedStructFaultRequest">
-        <part name="param" element="ns4:echoExtendedStructFaultRequest"/>
-    </message>
-    <message name="echoExtendedStructFaultResponse">
-        <part name="param" element="ns4:echoExtendedStructFaultResponse"/>
-    </message>
-
-    <message name="echoMultipleFaults1Request">
-        <part name="param" element="ns4:echoMultipleFaults1Request"/>
-    </message>
-    <message name="echoMultipleFaults1Response">
-        <part name="param" element="ns4:echoMultipleFaults1Response"/>
-    </message>
-
-    <message name="echoMultipleFaults2Request">
-        <part name="param" element="ns4:echoMultipleFaults2Request"/>
-    </message>
-    <message name="echoMultipleFaults2Response">
-        <part name="param" element="ns4:echoMultipleFaults2Response"/>
-    </message>
-
-    <!-- Fault messages -->
-    <message name="SOAPStructFault">
-        <part name="part3" element="ns3:SOAPStructFaultPart"/>
-    </message>
-    <message name="BaseStructFault">
-        <part name="part1" element="ns3:BaseStructPart"/>
-    </message>
-    <message name="ExtendedStructFault">
-        <part name="part2" element="ns3:ExtendedStructPart"/>
-    </message>
-    <message name="MoreExtendedStructFault">
-        <part name="part5" element="ns3:MoreExtendedStructPart"/>
-    </message>
-
-    <portType name="ComplexDocLitPortType">
-        <!--
-            Throws a fault with an embedded SOAPStruct
-        -->
-        <operation name="echoSOAPStructFault" parameterOrder="">
-            <input message="tns:echoSOAPStructFaultRequest"/>
-            <output message="tns:echoSOAPStructFaultResponse"/>
-            <fault name="ComplexFault" message="tns:SOAPStructFault"/>
-        </operation>
-
-        <!--
-            Throws a fault with a base complex struct
-        -->
-        <operation name="echoBaseStructFault" parameterOrder="">
-            <input message="tns:echoBaseStructFaultRequest"/>
-            <output message="tns:echoBaseStructFaultResponse"/>
-            <fault name="ComplexFault" message="tns:BaseStructFault"/>
-        </operation>
-
-        <!--
-            Throws a fault with an en extended complex type
-        -->
-        <operation name="echoExtendedStructFault" parameterOrder="">
-            <input message="tns:echoExtendedStructFaultRequest"/>
-            <output message="tns:echoExtendedStructFaultResponse"/>
-            <fault name="ComplexFault" message="tns:ExtendedStructFault"/>
-        </operation>
-
-        <!--
-            Throws a fault with embedded complex type, fault with an
-            extended complex type and fault with an array of a base
-            complex type
-        -->
-        <operation name="echoMultipleFaults1" parameterOrder="param">
-            <input message="tns:echoMultipleFaults1Request"/>
-            <output message="tns:echoMultipleFaults1Response"/>
-            <fault name="ComplexFault1" message="tns:SOAPStructFault"/>
-            <fault name="ComplexFault2" message="tns:BaseStructFault"/>
-        </operation>
-
-        <!--
-            Throws a fault with an array of base complex type and
-            a fault with doubly extended complex type
-        -->
-        <operation name="echoMultipleFaults2" parameterOrder="param">
-            <input message="tns:echoMultipleFaults2Request"/>
-            <output message="tns:echoMultipleFaults2Response"/>
-            <fault name="ComplexFault1" message="tns:BaseStructFault"/>
-            <fault name="ComplexFault2" message="tns:ExtendedStructFault"/>
-            <fault name="ComplexFault3" message="tns:MoreExtendedStructFault"/>
-        </operation>
-    </portType>
-
-    <binding name="ComplexDocLitBinding" type="tns:ComplexDocLitPortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <operation name="echoSOAPStructFault">
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="ComplexFault">
-                <soap:fault
-                    name="ComplexFault"
-                    use="literal"/>
-            </fault>
-            <soap:operation soapAction=""/>
-        </operation>
-
-        <operation name="echoBaseStructFault">
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="ComplexFault">
-                <soap:fault
-                    name="ComplexFault"
-                    use="literal"/>
-            </fault>
-            <soap:operation soapAction=""/>
-        </operation>
-
-        <operation name="echoExtendedStructFault">
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="ComplexFault">
-                <soap:fault
-                    name="ComplexFault"
-                    use="literal"/>
-            </fault>
-            <soap:operation soapAction=""/>
-        </operation>
-
-        <operation name="echoMultipleFaults1">
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="ComplexFault1">
-                <soap:fault
-                    name="ComplexFault1"
-                    use="literal"/>
-            </fault>
-            <fault name="ComplexFault2">
-                <soap:fault
-                    name="ComplexFault2"
-                    use="literal"/>
-            </fault>
-            <soap:operation soapAction=""/>
-        </operation>
-
-        <operation name="echoMultipleFaults2">
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="ComplexFault1">
-                <soap:fault
-                    name="ComplexFault1"
-                    use="literal"/>
-            </fault>
-            <fault name="ComplexFault2">
-                <soap:fault
-                    name="ComplexFault2"
-                    use="literal"/>
-            </fault>
-            <fault name="ComplexFault3">
-                <soap:fault
-                    name="ComplexFault3"
-                    use="literal"/>
-            </fault>
-            <soap:operation soapAction=""/>
-        </operation>
-    </binding>
-
-    <service name="ComplexDocLitService">
-        <port name="ComplexDocLitPort" binding="tns:ComplexDocLitBinding">
-            <soap:address
-                location="http://localhost:8080/axis/services/ComplexDocLitPort"/>
-        </port>
-    </service>
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:tns="http://soapinterop.org/wsdl"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:ns2="http://soapinterop.org/types"
+	xmlns:ns3="http://soapinterop.org/types/part"
+	xmlns:ns4="http://soapinterop.org/types/requestresponse"
+	targetNamespace="http://soapinterop.org/wsdl">
+
+	<types>
+		<schema
+			xmlns="http://www.w3.org/2001/XMLSchema"
+			xmlns:tns="http://soapinterop.org/types"
+			targetNamespace="http://soapinterop.org/types">
+
+			<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+
+			<complexType name="SOAPStruct">
+				<sequence>
+					<element name="varString" type="xsd:string"/>
+					<element name="varInt" type="xsd:int"/>
+					<element name="varFloat" type="xsd:float"/>
+				</sequence>
+			</complexType>
+
+			<complexType name="SOAPStructFault">
+				<sequence>
+					<element name="soapStruct" type="tns:SOAPStruct"/>
+				</sequence>
+			</complexType>
+
+			<complexType name="BaseStruct">
+				<sequence>
+					<element name="structMessage" type="tns:SOAPStruct"/>
+					<element name="shortMessage" type="xsd:short"/>
+				</sequence>
+			</complexType>
+
+			<complexType name="ExtendedStruct">
+				<complexContent>
+					<extension base="tns:BaseStruct">
+						<sequence>
+							<element name="stringMessage" type="xsd:string"/>
+							<element name="intMessage" type="xsd:int"/>
+							<element name="anotherIntMessage" type="xsd:int"/>
+						</sequence>
+					</extension>
+				</complexContent>
+			</complexType>
+
+			<complexType name="MoreExtendedStruct">
+				<complexContent>
+					<extension base="tns:ExtendedStruct">
+						<sequence>
+							<element name="booleanMessage" type="xsd:boolean"/>
+						</sequence>
+					</extension>
+				</complexContent>
+			</complexType>
+
+		</schema>
+
+		<schema
+			xmlns="http://www.w3.org/2001/XMLSchema"
+			xmlns:tns="http://soapinterop.org/types/part"
+			targetNamespace="http://soapinterop.org/types/part">
+
+			<element name="SOAPStructFaultPart" type="ns2:SOAPStructFault"/>
+			<element name="BaseStructPart" type="ns2:BaseStruct"/>
+			<element name="ExtendedStructPart" type="ns2:ExtendedStruct"/>
+			<element name="MoreExtendedStructPart" type="ns2:MoreExtendedStruct"/>
+
+		</schema>
+
+		<schema
+			xmlns="http://www.w3.org/2001/XMLSchema"
+			xmlns:tns="http://soapinterop.org/types/requestresponse"
+			targetNamespace="http://soapinterop.org/types/requestresponse">
+
+			<element name="echoSOAPStructFaultRequest" type="ns2:SOAPStruct"/>
+			<element name="echoSOAPStructFaultResponse">
+				<complexType/>
+			</element>
+
+			<element name="echoBaseStructFaultRequest" type="ns2:BaseStruct"/>
+			<element name="echoBaseStructFaultResponse">
+				<complexType/>
+			</element>
+
+			<element name="echoExtendedStructFaultRequest" type="ns2:ExtendedStruct"/>
+			<element name="echoExtendedStructFaultResponse">
+				<complexType/>
+			</element>
+
+			<element name="echoMultipleFaults1Request">
+				<complexType>
+					<sequence>
+						<element name="whichFault" type="xsd:int"/>
+						<element name="param1" type="ns2:SOAPStruct"/>
+						<element name="param2" type="ns2:BaseStruct"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="echoMultipleFaults1Response">
+				<complexType/>
+			</element>
+
+			<element name="echoMultipleFaults2Request">
+				<complexType>
+					<sequence>
+						<element name="whichFault" type="xsd:int"/>
+						<element name="param1" type="ns2:BaseStruct"/>
+						<element name="param2" type="ns2:ExtendedStruct"/>
+						<element name="param3" type="ns2:MoreExtendedStruct"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="echoMultipleFaults2Response">
+				<complexType/>
+			</element>
+
+		</schema>
+	</types>
+
+	<message name="echoSOAPStructFaultRequest">
+		<part name="param" element="ns4:echoSOAPStructFaultRequest"/>
+	</message>
+	<message name="echoSOAPStructFaultResponse">
+		<part name="param" element="ns4:echoSOAPStructFaultResponse"/>
+	</message>
+
+	<message name="echoBaseStructFaultRequest">
+		<part name="param" element="ns4:echoBaseStructFaultRequest"/>
+	</message>
+	<message name="echoBaseStructFaultResponse">
+		<part name="param" element="ns4:echoBaseStructFaultResponse"/>
+	</message>
+
+	<message name="echoExtendedStructFaultRequest">
+		<part name="param" element="ns4:echoExtendedStructFaultRequest"/>
+	</message>
+	<message name="echoExtendedStructFaultResponse">
+		<part name="param" element="ns4:echoExtendedStructFaultResponse"/>
+	</message>
+
+	<message name="echoMultipleFaults1Request">
+		<part name="param" element="ns4:echoMultipleFaults1Request"/>
+	</message>
+	<message name="echoMultipleFaults1Response">
+		<part name="param" element="ns4:echoMultipleFaults1Response"/>
+	</message>
+
+	<message name="echoMultipleFaults2Request">
+		<part name="param" element="ns4:echoMultipleFaults2Request"/>
+	</message>
+	<message name="echoMultipleFaults2Response">
+		<part name="param" element="ns4:echoMultipleFaults2Response"/>
+	</message>
+
+	<!-- Fault messages -->
+	<message name="SOAPStructFault">
+		<part name="part3" element="ns3:SOAPStructFaultPart"/>
+	</message>
+	<message name="BaseStructFault">
+		<part name="part1" element="ns3:BaseStructPart"/>
+	</message>
+	<message name="ExtendedStructFault">
+		<part name="part2" element="ns3:ExtendedStructPart"/>
+	</message>
+	<message name="MoreExtendedStructFault">
+		<part name="part5" element="ns3:MoreExtendedStructPart"/>
+	</message>
+
+	<portType name="ComplexDocLitPortType">
+		<!--
+			Throws a fault with an embedded SOAPStruct
+		-->
+		<operation name="echoSOAPStructFault" parameterOrder="">
+			<input message="tns:echoSOAPStructFaultRequest"/>
+			<output message="tns:echoSOAPStructFaultResponse"/>
+			<fault name="ComplexFault" message="tns:SOAPStructFault"/>
+		</operation>
+
+		<!--
+			Throws a fault with a base complex struct
+		-->
+		<operation name="echoBaseStructFault" parameterOrder="">
+			<input message="tns:echoBaseStructFaultRequest"/>
+			<output message="tns:echoBaseStructFaultResponse"/>
+			<fault name="ComplexFault" message="tns:BaseStructFault"/>
+		</operation>
+
+		<!--
+			Throws a fault with an en extended complex type
+		-->
+		<operation name="echoExtendedStructFault" parameterOrder="">
+			<input message="tns:echoExtendedStructFaultRequest"/>
+			<output message="tns:echoExtendedStructFaultResponse"/>
+			<fault name="ComplexFault" message="tns:ExtendedStructFault"/>
+		</operation>
+
+		<!--
+			Throws a fault with embedded complex type, fault with an
+			extended complex type and fault with an array of a base
+			complex type
+		-->
+		<operation name="echoMultipleFaults1" parameterOrder="param">
+			<input message="tns:echoMultipleFaults1Request"/>
+			<output message="tns:echoMultipleFaults1Response"/>
+			<fault name="ComplexFault1" message="tns:SOAPStructFault"/>
+			<fault name="ComplexFault2" message="tns:BaseStructFault"/>
+		</operation>
+
+		<!--
+			Throws a fault with an array of base complex type and
+			a fault with doubly extended complex type
+		-->
+		<operation name="echoMultipleFaults2" parameterOrder="param">
+			<input message="tns:echoMultipleFaults2Request"/>
+			<output message="tns:echoMultipleFaults2Response"/>
+			<fault name="ComplexFault1" message="tns:BaseStructFault"/>
+			<fault name="ComplexFault2" message="tns:ExtendedStructFault"/>
+			<fault name="ComplexFault3" message="tns:MoreExtendedStructFault"/>
+		</operation>
+	</portType>
+
+	<binding name="ComplexDocLitBinding" type="tns:ComplexDocLitPortType">
+		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+		<operation name="echoSOAPStructFault">
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="ComplexFault">
+				<soap:fault
+					name="ComplexFault"
+					use="literal"/>
+			</fault>
+			<soap:operation soapAction=""/>
+		</operation>
+
+		<operation name="echoBaseStructFault">
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="ComplexFault">
+				<soap:fault
+					name="ComplexFault"
+					use="literal"/>
+			</fault>
+			<soap:operation soapAction=""/>
+		</operation>
+
+		<operation name="echoExtendedStructFault">
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="ComplexFault">
+				<soap:fault
+					name="ComplexFault"
+					use="literal"/>
+			</fault>
+			<soap:operation soapAction=""/>
+		</operation>
+
+		<operation name="echoMultipleFaults1">
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="ComplexFault1">
+				<soap:fault 
+					name="ComplexFault1"
+					use="literal"/>
+			</fault>
+			<fault name="ComplexFault2">
+				<soap:fault
+					name="ComplexFault2"
+					use="literal"/>
+			</fault>
+			<soap:operation soapAction=""/>
+		</operation>
+
+		<operation name="echoMultipleFaults2">
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="ComplexFault1">
+				<soap:fault
+					name="ComplexFault1"
+					use="literal"/>
+			</fault>
+			<fault name="ComplexFault2">
+				<soap:fault 
+					name="ComplexFault2"
+					use="literal"/>
+			</fault>
+			<fault name="ComplexFault3">
+				<soap:fault 
+					name="ComplexFault3"
+					use="literal"/>
+			</fault>
+			<soap:operation soapAction=""/>
+		</operation>
+	</binding>
+
+	<service name="ComplexDocLitService">
+		<port name="ComplexDocLitPort" binding="tns:ComplexDocLitBinding">
+			<soap:address
+				location="http://localhost:8080/axis/services/ComplexDocLitPort"/>
+		</port>
+	</service>
 </definitions>
 

Added: webservices/axis2/trunk/java/modules/wsdl/test-resources/dime-doc.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test-resources/dime-doc.wsdl?rev=280518&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test-resources/dime-doc.wsdl (added)
+++ webservices/axis2/trunk/java/modules/wsdl/test-resources/dime-doc.wsdl Tue Sep 13 01:43:15 2005
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions name="SOAPBuilders" xmlns="http://soapinterop.org/attachments/wsdl" xmlns:types="http://soapinterop.org/attachments/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:dime="http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/" xmlns:content="http://schemas.xmlsoap.org/ws/2002/04/content-type/" xmlns:ref="http://schemas.xmlsoap.org/ws/2002/04/reference/" targetNamespace="http://soapinterop.org/attachments/wsdl">
+	<wsdl:types>
+		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/attachments/xsd" elementFormDefault="qualified" attributeFormDefault="qualified">
+			<import namespace="http://schemas.xmlsoap.org/ws/2002/04/reference/"/>
+			<import namespace="http://schemas.xmlsoap.org/ws/2002/04/content-type/"/>
+			<complexType name="ReferencedBinary">
+				<simpleContent>
+					<restriction base="xsd:base64Binary">
+						<annotation>
+							<appinfo>
+								<content:mediaType value="application/octetstream"/>
+							</appinfo>
+						</annotation>
+						<attribute ref="ref:location" use="optional"/>
+					</restriction>
+				</simpleContent>
+			</complexType>
+			<complexType name="ReferencedText">
+				<simpleContent>
+					<restriction base="xsd:base64Binary">
+						<annotation>
+							<appinfo>
+								<content:mediaType value="text/plain"/>
+							</appinfo>
+						</annotation>
+						<attribute ref="ref:location" use="optional"/>
+					</restriction>
+				</simpleContent>
+			</complexType>
+			<element name="EchoAttachment" type="types:EchoAttachment"/>
+			<element name="EchoAttachmentResponse" type="types:EchoAttachmentResponse"/>
+			<complexType name="EchoAttachment">
+				<sequence>
+					<element name="In" type="types:ReferencedBinary"/>
+				</sequence>
+			</complexType>
+			<complexType name="EchoAttachmentResponse">
+				<sequence>
+					<element name="Out" type="types:ReferencedBinary"/>
+				</sequence>
+			</complexType>
+			<element name="EchoAttachments" type="types:Attachments"/>
+			<element name="EchoAttachmentsResponse" type="types:Attachments"/>
+			<complexType name="Attachments">
+				<sequence>
+					<element name="Item" minOccurs="0" maxOccurs="unbounded" type="types:ReferencedBinary"/>
+				</sequence>
+			</complexType>
+			<element name="EchoAttachmentAsBase64" type="types:EchoAttachment"/>
+			<element name="EchoAttachmentAsBase64Response" type="types:base64Out"/>
+			<element name="EchoBase64AsAttachment" type="types:base64In"/>
+			<element name="EchoBase64AsAttachmentResponse" type="types:EchoAttachmentResponse"/>
+			<complexType name="base64In">
+				<sequence>
+					<element name="In" type="xsd:base64Binary"/>
+				</sequence>
+			</complexType>
+			<complexType name="base64Out">
+				<sequence>
+					<element name="Out" type="xsd:base64Binary"/>
+				</sequence>
+			</complexType>
+			<element name="EchoUnrefAttachments" type="types:emptyType"/>
+			<element name="EchoUnrefAttachmentsResponse" type="types:emptyType"/>
+			<complexType name="emptyType">
+				<sequence/>
+			</complexType>
+			<element name="EchoAttachmentAsString" type="types:EchoAttachmentAsString"/>
+			<element name="EchoAttachmentAsStringResponse" type="types:EchoAttachmentAsStringResponse"/>
+			<complexType name="EchoAttachmentAsString">
+				<sequence>
+					<element name="In" type="types:ReferencedText"/>
+				</sequence>
+			</complexType>
+			<complexType name="EchoAttachmentAsStringResponse">
+				<sequence>
+					<element name="Out" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+	</wsdl:types>
+	<wsdl:message name="EchoAttachmentIn">
+		<wsdl:part name="In" element="types:EchoAttachment"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentOut">
+		<wsdl:part name="Out" element="types:EchoAttachmentResponse"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentsIn">
+		<wsdl:part name="In" element="types:EchoAttachments"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentsOut">
+		<wsdl:part name="Out" element="types:EchoAttachmentsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentAsBase64In">
+		<wsdl:part name="In" element="types:EchoAttachmentAsBase64"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentAsBase64Out">
+		<wsdl:part name="Out" element="types:EchoAttachmentAsBase64Response"/>
+	</wsdl:message>
+	<wsdl:message name="EchoBase64AsAttachmentIn">
+		<wsdl:part name="In" element="types:EchoBase64AsAttachment"/>
+	</wsdl:message>
+	<wsdl:message name="EchoBase64AsAttachmentOut">
+		<wsdl:part name="Out" element="types:EchoBase64AsAttachmentResponse"/>
+	</wsdl:message>
+	<wsdl:message name="EchoUnrefAttachmentsIn">
+		<wsdl:part name="In" element="types:EchoUnrefAttachments"/>
+	</wsdl:message>
+	<wsdl:message name="EchoUnrefAttachmentsOut">
+		<wsdl:part name="Out" element="types:EchoUnrefAttachmentsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentAsStringIn">
+		<wsdl:part name="In" element="types:EchoAttachmentAsString"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentAsStringOut">
+		<wsdl:part name="Out" element="types:EchoAttachmentAsStringResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="AttachmentsPortType">
+		<wsdl:operation name="EchoAttachment">
+			<wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/>
+			<wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachments">
+			<wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/>
+			<wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachmentAsBase64">
+			<wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/>
+			<wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoBase64AsAttachment">
+			<wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/>
+			<wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoUnrefAttachments">
+			<wsdl:input name="EchoUnrefAttachmentsInput" message="EchoUnrefAttachmentsIn"/>
+			<wsdl:output name="EchoUnrefAttachmentsOutput" message="EchoUnrefAttachmentsOut"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachmentAsString">
+			<wsdl:input name="EchoAttachmentAsStringInput" message="EchoAttachmentAsStringIn"/>
+			<wsdl:output name="EchoAttachmentAsStringOutput" message="EchoAttachmentAsStringOut"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="EchoAttachment">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentInput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentOutput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachments">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentsInput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentsOutput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachmentAsBase64">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentAsBase64Input">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentAsBase64Output">
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoBase64AsAttachment">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoBase64AsAttachmentInput">
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="EchoBase64AsAttachmentOutput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoUnrefAttachments">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoUnrefAttachmentsInput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/open-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="EchoUnrefAttachmentsOutput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/open-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachmentAsString">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentAsStringInput">
+				<dime:message layout="http://schemas.xmlsoap.org/ws/2002/04/dime/closed-layout" wsdl:required="true"/>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentAsStringOutput">
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+    <wsdl:service name="DimeDOCInterop">
+	    <wsdl:port name="DimeDOCSoapPort" binding="AttachmentsBinding">
+            <soap:address location="http://localhost:8080/axis/services/DimeDOCSoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

Added: webservices/axis2/trunk/java/modules/wsdl/test-resources/mime-doc.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test-resources/mime-doc.wsdl?rev=280518&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test-resources/mime-doc.wsdl (added)
+++ webservices/axis2/trunk/java/modules/wsdl/test-resources/mime-doc.wsdl Tue Sep 13 01:43:15 2005
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions name="SOAPBuilders" 
+    xmlns="http://soapinterop.org/attachments/wsdl" 
+    xmlns:types="http://soapinterop.org/attachments/xsd" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
+    xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" 
+    targetNamespace="http://soapinterop.org/attachments/wsdl">
+	<wsdl:types>
+		<schema 
+			xmlns="http://www.w3.org/2001/XMLSchema" 
+			targetNamespace="http://soapinterop.org/attachments/xsd" 
+			elementFormDefault="qualified"
+			attributeFormDefault="qualified">
+		
+		<complexType name="binary">
+			<simpleContent>
+				<extension base="xsd:base64Binary">
+					<attribute name="href" type="xsd:anyURI"/>
+				</extension>
+			</simpleContent>
+		</complexType >
+		
+		<element name="EchoAttachment" type="types:EchoAttachment"/>
+		<element name="EchoAttachmentResponse" type="types:EchoAttachmentResponse"/>
+		<complexType name="EchoAttachment">
+			<sequence>
+				<element name="In" type="types:binary"/>
+			</sequence>
+		</complexType>
+		<complexType name="EchoAttachmentResponse">
+			<sequence>
+				<element name="Out" type="types:binary"/>
+			</sequence>
+		</complexType>
+		
+		<element name="EchoAttachments" type="types:Attachments"/>
+		<element name="EchoAttachmentsResponse" type="types:Attachments"/>
+		<complexType name="Attachments">
+			<sequence>
+				<element name="Item" minOccurs="0" maxOccurs="unbounded" type="types:binary">
+				</element>
+			</sequence>
+		</complexType>
+		
+		<element name="EchoAttachmentAsBase64" type="types:EchoAttachment"/>
+		<element name="EchoAttachmentAsBase64Response" type="types:EchoAttachmentResponse"/>
+		
+		<element name="EchoBase64AsAttachment" type="types:EchoAttachment"/>
+		<element name="EchoBase64AsAttachmentResponse" type="types:EchoAttachmentResponse"/>
+		</schema>
+	</wsdl:types>
+	
+	<wsdl:message name="EchoAttachmentIn">
+		<wsdl:part name="In" element="types:EchoAttachment"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentOut">
+		<wsdl:part name="Out" element="types:EchoAttachmentResponse"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentsIn">
+		<wsdl:part name="In" element="types:EchoAttachments"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentsOut">
+		<wsdl:part name="Out" element="types:EchoAttachmentsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentAsBase64In">
+		<wsdl:part name="In" element="types:EchoAttachmentAsBase64"/>
+	</wsdl:message>
+	<wsdl:message name="EchoAttachmentAsBase64Out">
+		<wsdl:part name="Out" element="types:EchoAttachmentAsBase64Response"/>
+	</wsdl:message>
+	<wsdl:message name="EchoBase64AsAttachmentIn">
+		<wsdl:part name="In" element="types:EchoBase64AsAttachment"/>
+	</wsdl:message>
+	<wsdl:message name="EchoBase64AsAttachmentOut">
+		<wsdl:part name="Out" element="types:EchoBase64AsAttachmentResponse"/>
+	</wsdl:message>
+	
+	<wsdl:portType name="AttachmentsPortType">
+		<wsdl:operation name="EchoAttachment">
+			<wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/>
+			<wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachments">
+			<wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/>
+			<wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachmentAsBase64">
+			<wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/>
+			<wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/>
+		</wsdl:operation>
+		<wsdl:operation name="EchoBase64AsAttachment">
+			<wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/>
+			<wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="EchoAttachment">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentInput">
+				<mime:multipartRelated>
+					<mime:part>
+						<soap:body use="literal"/>
+					</mime:part>
+					<mime:part>
+						<mime:content part="In" type="application/octetstream"/>
+					</mime:part>
+				</mime:multipartRelated>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentOutput">
+				<mime:multipartRelated>
+					<mime:part>
+						<soap:body use="literal" />
+					</mime:part>
+					<mime:part>
+						<mime:content part="Out" type="application/octetstream"/>
+					</mime:part>
+				</mime:multipartRelated>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachments">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentsInput">
+				<mime:multipartRelated>
+					<mime:part>
+						<soap:body use="literal"/>
+					</mime:part>
+					<mime:part>
+						<mime:content part="In" type="application/octetstream"/>
+					</mime:part>
+				</mime:multipartRelated>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentsOutput">
+				<mime:multipartRelated>
+					<mime:part>
+						<soap:body use="literal"/>
+					</mime:part>
+					<mime:part>
+						<mime:content part="Out" type="application/octetstream"/>
+					</mime:part>
+				</mime:multipartRelated>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoAttachmentAsBase64">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoAttachmentAsBase64Input">
+				<mime:multipartRelated>
+					<mime:part>
+						<soap:body use="literal"/>
+					</mime:part>
+					<mime:part>
+						<mime:content part="In" type="application/octetstream"/>
+					</mime:part>
+				</mime:multipartRelated>
+			</wsdl:input>
+			<wsdl:output name="EchoAttachmentAsBase64Output">
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="EchoBase64AsAttachment">
+			<soap:operation soapAction="http://soapinterop.org/attachments/"/>
+			<wsdl:input name="EchoBase64AsAttachmentInput">
+				<soap:body use="literal" />
+			</wsdl:input>
+			<wsdl:output name="EchoBase64AsAttachmentOutput">
+				<mime:multipartRelated>
+					<mime:part>
+						<soap:body use="literal"/>
+					</mime:part>
+					<mime:part>
+						<mime:content part="Out" type="application/octetstream"/>
+					</mime:part>
+				</mime:multipartRelated>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+    <wsdl:service name="MimeDOCInterop">
+	    <wsdl:port name="MimeDOCSoapPort" binding="AttachmentsBinding">
+            <soap:address location="http://localhost:8080/axis/services/MimeDOCSoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>	
\ No newline at end of file

Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java?rev=280518&r1=280517&r2=280518&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java Tue Sep 13 01:43:15 2005
@@ -32,7 +32,7 @@
 
     public static final String OUTPUT_LOCATION_BASE = "./out_put_classes";
     public static final String OUTPUT_LOCATION_PREFIX = "/test";
-    private static int FOLDER_COUNT = 0;
+    private static int folderCount = 0;
     // public static final String OUTPUT_LOCATION_BASE = "C:\\GeneratedCode\\test4\\src";
     public static final String WSDL_BASE_DIR = "./test-resources/";
     public static final String CLASSES_DIR = "/target/classes/";
@@ -92,7 +92,7 @@
     public void testCodeGenerationWSAT(){
 
         try {
-            generateAndCompile("wsat.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+            generateAndCompile("wsat.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
             fail("Exception while code generation test!"+ e.getMessage());
         }
@@ -105,19 +105,67 @@
     public void testCodeGenerationPing(){
 
         try {
-            generateAndCompile("ping.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+            generateAndCompile("ping.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
             fail("Exception while code generation test!"+ e.getMessage());
         }
     }
 
+
+    /**
+     * Test for the interoptestdoclitparameters
+     */
+    public void testCodeGenerationInteropTestDocLitParams(){
+
+        try {
+            generateAndCompile("interoptestdoclitparameters.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+        } catch (CodeGenerationException e) {
+            fail("Exception while code generation test!"+ e.getMessage());
+        }
+    }
+
+    /**
+     * Test for the sales rank and price!
+     */
+    public void testCodeGenerationSalesRankNPrice(){
+
+        try {
+            generateAndCompile("SalesRankNPrice.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+        } catch (CodeGenerationException e) {
+            fail("Exception while code generation test!"+ e.getMessage());
+        }
+    }
+
+     /**
+     * Test for the mime doc
+     */
+    public void testCodeGenerationMimeDoc(){
+
+        try {
+            generateAndCompile("mime-doc.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+        } catch (CodeGenerationException e) {
+            fail("Exception while code generation test!"+ e.getMessage());
+        }
+    }
+
+//     /**
+//     * Test for the dime doc
+//     */
+//    public void testCodeGenerationDimeDoc(){
+//
+//        try {
+//            generateAndCompile("dime-doc.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+//        } catch (CodeGenerationException e) {
+//            fail("Exception while code generation test!"+ e.getMessage());
+//        }
+//    }
     /**
      * Test for the wscoor.wsdl
      */
     public void testCodeGenerationWSCOOR(){
 
         try {
-            generateAndCompile("interoptestdoclit.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+            generateAndCompile("interoptestdoclit.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
             fail("Exception while code generation test!"+ e.getMessage());
         }
@@ -130,7 +178,7 @@
     public void testCodeGenerationPingModified(){
 
         try {
-            generateAndCompile("ping-modified.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+            generateAndCompile("ping-modified.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
             fail("Exception while code generation test!"+ e.getMessage());
         }
@@ -143,13 +191,38 @@
     public void testCodeGenerationPingUnbound(){
 
         try {
-            generateAndCompile("ping-unbound.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+            generateAndCompile("ping-unbound.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
             fail("Exception while code generation test!"+ e.getMessage());
         }
     }
 
     /**
+     * Test for the simple doc lit from Axis 1
+     *
+     */
+    public void testCodeGenerationSimpleDocLiteral(){
+
+        try {
+            generateAndCompile("simple-doc-literal.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+        } catch (CodeGenerationException e) {
+            fail("Exception while code generation test!"+ e.getMessage());
+        }
+    }
+
+    /**
+     * Test for the simple doc lit from Axis 1
+     *
+     */
+    public void testCodeGenerationComplexDocLiteral(){
+
+        try {
+            generateAndCompile("complex-doc-literal.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+        } catch (CodeGenerationException e) {
+            fail("Exception while code generation test!"+ e.getMessage());
+        }
+    }
+    /**
      * Test for the mtom echo wsdl. This wsdl contains a restriction based on xmime and a
      * SOAP 1.2 binding
      *
@@ -157,7 +230,7 @@
     public void testCodeGenerationMTOMEcho(){
 
         try {
-            generateAndCompile("mtomecho.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+            generateAndCompile("mtomecho.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
             fail("Exception while code generation test!"+ e.getMessage());
         }
@@ -199,7 +272,7 @@
         //using the ant javac task for compilation
         Javac javaCompiler = new Javac();
         Project codeGenProject = new Project();
-         Target compileTarget = new Target();
+        Target compileTarget = new Target();
 
         compileTarget.setName(COMPILE_TARGET_NAME);
         compileTarget.addTask(javaCompiler);