Author: veithen
Date: Wed Feb 26 21:50:50 2014
New Revision: 1572282
URL: http://svn.apache.org/r1572282
Log:
Added test cases for AXIS-2378 and AXIS-2901.
Added:
axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/
axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/build.xml (with
props)
axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/
axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/build.xml (with
props)
axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2378/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2378/sample.wsdl
axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2901/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2901/sample.wsdl
Modified:
axis/axis1/java/trunk/axis-ant/pom.xml
Modified: axis/axis1/java/trunk/axis-ant/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/pom.xml?rev=1572282&r1=1572281&r2=1572282&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Wed Feb 26 21:50:50 2014
@@ -78,7 +78,9 @@
<target>
<taskdef name="java2wsdl"
classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask"
classpathref="maven.compile.classpath" />
<taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
classpathref="maven.compile.classpath" />
+ <!-- ant
antfile="src/test/ant/axis2378/build.xml" target="test" inheritrefs="true" /-->
<ant antfile="src/test/ant/axis2900/build.xml"
target="test" inheritrefs="true" />
+ <!-- ant
antfile="src/test/ant/axis2901/build.xml" target="test" inheritrefs="true" /-->
<ant antfile="src/test/ant/clash/build.xml"
target="test" inheritrefs="true" />
<ant antfile="src/test/ant/extra/build.xml"
target="test" inheritrefs="true" />
<ant antfile="src/test/ant/filegen/build.xml"
target="test" inheritrefs="true" />
Added: axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/build.xml?rev=1572282&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/build.xml (added)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/build.xml Wed Feb 26
21:50:50 2014
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<project>
+ <target name="test">
+ <mkdir dir="${project.build.directory}/work"/>
+ <wsdl2java url="src/test/wsdl/axis2378/sample.wsdl"
+ output="${project.build.directory}/work">
+ <mapping namespace="urn:mycompany:/crCarl/TransformServiceWithURL"
package="test.wsdl.axis2378"/>
+ </wsdl2java>
+ </target>
+</project>
Propchange: axis/axis1/java/trunk/axis-ant/src/test/ant/axis2378/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/build.xml?rev=1572282&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/build.xml (added)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/build.xml Wed Feb 26
21:50:50 2014
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<project>
+ <target name="test">
+ <mkdir dir="${project.build.directory}/work"/>
+ <wsdl2java url="src/test/wsdl/axis2901/sample.wsdl"
+ output="${project.build.directory}/work">
+ <mapping namespace="http://sample.com/URI";
package="test.wsdl.axis2901.service"/>
+ <!-- This is essential: the issue occurs only if the two namespaces are
mapped to the same package -->
+ <mapping namespace="http://com.sample.MyDetails.xsd";
package="test.wsdl.axis2901"/>
+ <mapping namespace="http://com.sample.MyDetailsRequest.xsd";
package="test.wsdl.axis2901"/>
+ </wsdl2java>
+ </target>
+</project>
Propchange: axis/axis1/java/trunk/axis-ant/src/test/ant/axis2901/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2378/sample.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2378/sample.wsdl?rev=1572282&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2378/sample.wsdl (added)
+++ axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2378/sample.wsdl Wed Feb
26 21:50:50 2014
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions
targetNamespace="urn:mycompany:/crCarl/TransformServiceWithURL"
xmlns:tns="urn:mycompany:/crCarl/TransformServiceWithURL"
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns1="http://www.example.org/NewXMLSchema";
xmlns="http://schemas.xmlsoap.org/wsdl/";>
+ <wsdl:types>
+ <schema targetNamespace="http://www.example.org/NewXMLSchema";
xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://www.example.org/NewXMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+
+<xsd:simpleType name="URL">
+<xsd:restriction base="string">
+<xsd:maxLength value="1024"/>
+</xsd:restriction>
+</xsd:simpleType>
+
+<xsd:simpleType name="URL_Type">
+<xsd:restriction base="tns:URL"/>
+</xsd:simpleType>
+
+<xsd:element name="URL" type="tns:URL_Type"/>
+
+<xsd:complexType name="ContactInfo_Type">
+<xsd:sequence>
+<xsd:element minOccurs="0" ref="tns:URL"/>
+</xsd:sequence>
+</xsd:complexType>
+
+
+</schema>
+ </wsdl:types>
+ <wsdl:message name="transformTransformServiceWithURLRequest">
+ <wsdl:part name="NewXMLSchema" element="tns1:URL"/>
+ </wsdl:message>
+ <wsdl:message name="transformTransformServiceWithURLResponse">
+ <wsdl:part name="NewXMLSchema2" element="tns1:URL"/>
+ </wsdl:message>
+ <wsdl:portType name="TransformServiceWithURL">
+ <wsdl:operation name="transformTransformServiceWithURL">
+ <wsdl:input name="transformTransformServiceWithURLRequest"
message="tns:transformTransformServiceWithURLRequest"/>
+ <wsdl:output name="transformTransformServiceWithURLResponse"
message="tns:transformTransformServiceWithURLResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="TransformServiceWithURLHTTP_Binding"
type="tns:TransformServiceWithURL">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="transformTransformServiceWithURL">
+ <soap:operation
soapAction="urn:mycompany:/crCarl/TransformServiceWithURL/TransformServiceWithURL/transformTransformServiceWithURLRequest#"/>
+ <wsdl:input name="transformTransformServiceWithURLRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="transformTransformServiceWithURLResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TransformServiceWithURL">
+ <wsdl:port name="TransformServiceWithURL_SOAP_HTTP_Port"
binding="tns:TransformServiceWithURLHTTP_Binding">
+ <soap:address
location="http://DANIELVA.sybase.com:8080/TransformServiceWithURL/services/SOAPHandler/HTTPTransport/urn~3Amycompany~3A/crCarl/TransformServiceWithURL/TransformServiceWithURL"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Added: axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2901/sample.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2901/sample.wsdl?rev=1572282&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2901/sample.wsdl (added)
+++ axis/axis1/java/trunk/axis-ant/src/test/wsdl/axis2901/sample.wsdl Wed Feb
26 21:50:50 2014
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:ns1="http://com.sample.MyDetails.xsd";
xmlns:tns="http://sample.com/URI"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:ns0="http://com.sample.MyDetailsRequest.xsd";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; name="Untitled"
targetNamespace="http://sample.com/URI";>
+ <wsdl:types>
+
+ <xs:schema xmlns="http://com.sample.MyDetails.xsd";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://com.sample.MyDetails.xsd";
elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="Name">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ns1:FirstElement" minOccurs="0"/>
+ <xs:element ref="ns1:SecondElement" minOccurs="0"/>
+ <xs:element ref="ns1:ThirdElement" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="MyDetails">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ns1:Name" minOccurs="0"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="FirstElement" type="xs:string"/>
+ <xs:element name="SecondElement" type="xs:string"/>
+ <xs:element name="ThirdElement" type="xs:string"/>
+ </xs:schema>
+ <xs:schema xmlns="http://com.sample.MyDetailsRequest.xsd";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://com.sample.MyDetailsRequest.xsd";
elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="MyRequestDetails">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ns0:Names" minOccurs="0"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Names">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ns0:FirstElement"/>
+ <xs:element ref="ns0:SecondElement"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="FirstElement" type="xs:string"/>
+ <xs:element name="SecondElement" type="xs:string"/>
+ </xs:schema>
+ </wsdl:types>
+ <wsdl:service name="GetXXsProcess">
+ <wsdl:port name="GetXXsProcess" binding="tns:GetXXsProcessBinding">
+ <soap:address location="http://com.sample/service"/>
+ </wsdl:port>
+ </wsdl:service>
+ <wsdl:portType name="MyDetailsService">
+ <wsdl:operation name="MyOperation">
+ <wsdl:input message="tns:MyRequest"/>
+ <wsdl:output message="tns:MyResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="GetXXsProcessBinding" type="tns:MyDetailsService">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="MyOperation">
+ <soap:operation style="document"
soapAction="/Action/GetXXsProcess"/>
+ <wsdl:input>
+ <soap:body use="literal" parts="MyRequestParameter"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" parts="MyResponseParameter"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:message name="MyRequest">
+ <wsdl:part name="MyRequestParameter" element="ns0:MyRequestDetails"/>
+ </wsdl:message>
+ <wsdl:message name="MyResponse">
+ <wsdl:part name="MyResponseParameter" element="ns1:MyDetails"/>
+ </wsdl:message>
+
+</wsdl:definitions>
\ No newline at end of file
