tomj 2002/06/02 20:07:00
Modified: java/test/wsdl/interop3/docLitParam DocLitParamTestCase.java
build.xml
java/test/wsdl/interop3 endpoints
Added: java/test/wsdl/interop3/docLitParam
interoptestdoclitparameters.wsdl
java/test/wsdl/interop3 endpoints-local
Log:
Bring a copy of the white mesa WSDL for the docLitParam test local and change
the name of the port to avoid a duplicate service name that prevents us running
against ourselves.
Add an endpoints-local file that can be used with run.sh to
test interop axis to axis.
Revision Changes Path
1.2 +2 -2
xml-axis/java/test/wsdl/interop3/docLitParam/DocLitParamTestCase.java
Index: DocLitParamTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/docLitParam/DocLitParamTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocLitParamTestCase.java 31 May 2002 20:28:21 -0000 1.1
+++ DocLitParamTestCase.java 3 Jun 2002 03:07:00 -0000 1.2
@@ -40,9 +40,9 @@
WSDLInteropTestDocLitPortBinding binding;
try {
if (url != null) {
- binding = new
WSDLInteropTestDocLitServiceLocator().getWSDLInteropTestDocLitPort(url);
+ binding = new
WSDLInteropTestDocLitServiceLocator().getWSDLInteropTestDocLitParamPort(url);
} else {
- binding = new
WSDLInteropTestDocLitServiceLocator().getWSDLInteropTestDocLitPort();
+ binding = new
WSDLInteropTestDocLitServiceLocator().getWSDLInteropTestDocLitParamPort();
}
}
catch (javax.xml.rpc.ServiceException jre) {
1.13 +4 -1 xml-axis/java/test/wsdl/interop3/docLitParam/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/docLitParam/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 31 May 2002 20:28:21 -0000 1.12
+++ build.xml 3 Jun 2002 03:07:00 -0000 1.13
@@ -18,7 +18,10 @@
<property name="testname" value="docLitParam"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/InteropTestDocLitParameters.wsdl";
+ <!-- The white mesa WSDL has the same port name for this test as for the
+ docLit test, which means Axis gets two services with the same name -->
+ <!-- url="http://www.whitemesa.com/r3/InteropTestDocLitParameters.wsdl"; -->
+ <wsdl2java url="test/wsdl/interop3/docLitParam/interoptestdoclitparameters.wsdl"
output="${root.dir}/build/work" skeletonDeploy="yes"
serverSide="yes"/>
1.1
xml-axis/java/test/wsdl/interop3/docLitParam/interoptestdoclitparameters.wsdl
Index: interoptestdoclitparameters.wsdl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<definitions name="WSDLInteropTestDocLitService"
targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit";
xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsd1="http://soapinterop.org/xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<types>
<schema targetNamespace="http://soapinterop.org/xsd";
xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
<complexType name="ArrayOfstring_literal">
<sequence>
<element maxOccurs="unbounded" minOccurs="1" name="string"
type="xsd:string"/>
</sequence>
</complexType>
<complexType name="SOAPStruct">
<all>
<element name="varFloat" type="xsd:float"/>
<element name="varInt" type="xsd:int"/>
<element name="varString" type="xsd:string"/>
</all>
</complexType>
<element name="echoString">
<complexType>
<sequence>
<element name="param0" type="xsd:string"/>
</sequence>
</complexType>
</element>
<element name="echoStringResponse">
<complexType>
<sequence>
<element name="return" type="xsd:string"/>
</sequence>
</complexType>
</element>
<element name="echoStringArray">
<complexType>
<sequence>
<element name="param0" type="xsd1:ArrayOfstring_literal"/>
</sequence>
</complexType>
</element>
<element name="echoStringArrayResponse">
<complexType>
<sequence>
<element name="return" type="xsd1:ArrayOfstring_literal"/>
</sequence>
</complexType>
</element>
<element name="echoStruct">
<complexType>
<sequence>
<element name="param0" type="xsd1:SOAPStruct"/>
</sequence>
</complexType>
</element>
<element name="echoStructResponse">
<complexType>
<sequence>
<element name="return" type="xsd1:SOAPStruct"/>
</sequence>
</complexType>
</element>
<element name="echoVoid">
<complexType/>
</element>
<element name="echoVoidResponse">
<complexType/>
</element>
</schema>
</types>
<message name="echoString">
<part element="xsd1:echoString" name="parameters"/>
</message>
<message name="echoStringResponse">
<part element="xsd1:echoStringResponse" name="parameters"/>
</message>
<message name="echoStringArray">
<part element="xsd1:echoStringArray" name="parameters"/>
</message>
<message name="echoStringArrayResponse">
<part element="xsd1:echoStringArrayResponse" name="parameters"/>
</message>
<message name="echoStruct">
<part element="xsd1:echoStruct" name="parameters"/>
</message>
<message name="echoStructResponse">
<part element="xsd1:echoStructResponse" name="parameters"/>
</message>
<message name="echoVoid">
<part element="xsd1:echoVoid" name="parameters"/>
</message>
<message name="echoVoidResponse">
<part element="xsd1:echoVoidResponse" name="parameters"/>
</message>
<portType name="WSDLInteropTestDocLitPortType">
<operation name="echoString">
<input message="tns:echoString" name="echoString"/>
<output message="tns:echoStringResponse" name="echoStringResponse"/>
</operation>
<operation name="echoStringArray">
<input message="tns:echoStringArray" name="echoStringArray"/>
<output message="tns:echoStringArrayResponse"
name="echoStringArrayResponse"/>
</operation>
<operation name="echoStruct">
<input message="tns:echoStruct" name="echoStruct"/>
<output message="tns:echoStructResponse" name="echoStructResponse"/>
</operation>
<operation name="echoVoid">
<input message="tns:echoVoid" name="echoVoid"/>
<output message="tns:echoVoidResponse" name="echoVoidResponse"/>
</operation>
</portType>
<binding name="WSDLInteropTestDocLitPortBinding"
type="tns:WSDLInteropTestDocLitPortType">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="echoString">
<soap:operation soapAction="http://soapinterop.org/"; style="document"/>
<input name="echoString">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</input>
<output name="echoStringResponse">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</output>
</operation>
<operation name="echoStringArray">
<soap:operation soapAction="http://soapinterop.org/"; style="document"/>
<input name="echoStringArray">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</input>
<output name="echoStringArrayResponse">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</output>
</operation>
<operation name="echoStruct">
<soap:operation soapAction="http://soapinterop.org/"; style="document"/>
<input name="echoStruct">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</input>
<output name="echoStructResponse">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</output>
</operation>
<operation name="echoVoid">
<soap:operation soapAction="http://soapinterop.org/"; style="document"/>
<input name="echoVoid">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</input>
<output name="echoVoidResponse">
<soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit";
use="literal"/>
</output>
</operation>
</binding>
<service name="WSDLInteropTestDocLitService">
<port binding="tns:WSDLInteropTestDocLitPortBinding"
name="WSDLInteropTestDocLitParamPort">
<soap:address
location="http://www.whitemesa.net/interop/r3/doclitparam"/>
</port>
</service>
</definitions>
1.2 +8 -3 xml-axis/java/test/wsdl/interop3/endpoints
Index: endpoints
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/endpoints,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- endpoints 31 May 2002 20:28:21 -0000 1.1
+++ endpoints 3 Jun 2002 03:07:00 -0000 1.2
@@ -13,9 +13,14 @@
DocLitParam=http://www.whitemesa.net/interop/r3/doclitparam
RpcEnc=http://www.whitemesa.net/interop/r3/rpcEnc
-#
+# No client for this one yet
EmptySA=http://www.whitemesa.net/interop/r3/emptySA
-#Group E
-TestList=
+# Group E
+
+#
+# NOTE: this test takes the WSDL URL
+TestList=http://mssoapinterop.org/stkv3/wsdl/interopTestList.wsdl
+
+# we don't have this one yet
TestHeaders=http://www.whitemesa.net/interop/r3/testheaders
1.1 xml-axis/java/test/wsdl/interop3/endpoints-local
Index: endpoints-local
===================================================================
#
# Local Axis endpoints
#
# Where <endpointfile> has the syntax
# TESTNAME="<endpoint>"
#
Import1=http://localhost:8080/axis/services/SoapInteropImport1Port
Import2=http://localhost:8080/axis/services/SoapInteropImport2Port
Import3=http://localhost:8080/axis/services/SoapInteropImport3Port
Compound1=http://localhost:8080/axis/services/SoapInteropCompound1Port
Compound2=http://localhost:8080/axis/services/SoapInteropCompound2Port
DocLit=http://localhost:8080/axis/services/WSDLInteropTestDocLitPort
DocLitParam=http://localhost:8080/axis/services/WSDLInteropTestDocLitParamPort
RpcEnc=http://localhost:8080/axis/services/WSDLInteropTestRpcEncPort
# No client for this one yet
EmptySA=
# Group E
#
# NOTE: this test takes the WSDL URL
#TestList=http://localhost:8080/axis/services/SoapInteropTestListPort?WSDL
TestList=
# we don't have this one yet
TestHeaders=
