Author: mmao
Date: Tue Sep 12 19:54:23 2006
New Revision: 442803
URL: http://svn.apache.org/viewvc?view=rev&rev=442803
Log:
To fix the cruisecontrol build
* Different system test using different service/port
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?view=diff&rev=442803&r1=442802&r2=442803
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Tue Sep 12 19:54:23 2006
@@ -44,14 +44,16 @@
public class DispatchClientServerTest extends ClientServerTestBase {
- private final QName serviceName = new
QName("http://apache.org/hello_world_soap_http";, "SOAPService");
- private final QName portName = new
QName("http://apache.org/hello_world_soap_http";, "SoapPort");
+ private final QName serviceName = new
QName("http://apache.org/hello_world_soap_http";,
+ "SOAPDispatchService");
+ private final QName portName = new
QName("http://apache.org/hello_world_soap_http";,
+ "SoapDispatchPort");
public static class Server extends TestServerBase {
protected void run() {
Object implementor = new GreeterImpl();
- String address = "http://localhost:9000/SoapContext/SoapPort";;
+ String address =
"http://localhost:9006/SOAPDispatchService/SoapDispatchPort";;
Endpoint.publish(address, implementor);
}
@@ -121,33 +123,27 @@
.getFirstChild().getTextContent());
}
- // public void testDOMSourcePAYLOAD() throws Exception {
- // URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
- // assertNotNull(wsdl);
- //
- // SOAPService service = new SOAPService(wsdl, serviceName);
- // assertNotNull(service);
- //
- // InputStream is =
- // getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
- // SOAPMessage soapReqMsg =
MessageFactory.newInstance().createMessage(null,
- // is);
- // DOMSource domReqMsg = new
- // DOMSource(soapReqMsg.getSOAPBody().extractContentAsDocument());
- // assertNotNull(domReqMsg);
- //
- // Dispatch<DOMSource> disp = service.createDispatch(portName,
- // DOMSource.class,
- // Service.Mode.PAYLOAD);
- //
- // // invoke
- // DOMSource domResMsg = disp.invoke(domReqMsg);
- // assertNotNull(domResMsg);
- // String expected = "Hello TestSOAPInputMessage";
- // assertEquals("Response should be : Hello TestSOAPInputMessage",
- // expected, domResMsg.getNode()
- // .getFirstChild().getTextContent());
- // }
+ public void testDOMSourcePAYLOAD() throws Exception {
+ URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
+ assertNotNull(wsdl);
+
+ SOAPService service = new SOAPService(wsdl, serviceName);
+ assertNotNull(service);
+
+ InputStream is =
getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
+ SOAPMessage soapReqMsg =
MessageFactory.newInstance().createMessage(null, is);
+ DOMSource domReqMsg = new
DOMSource(soapReqMsg.getSOAPBody().extractContentAsDocument());
+ assertNotNull(domReqMsg);
+
+ Dispatch<DOMSource> disp = service.createDispatch(portName,
DOMSource.class, Service.Mode.PAYLOAD);
+
+ // invoke
+ DOMSource domResMsg = disp.invoke(domReqMsg);
+ assertNotNull(domResMsg);
+ String expected = "Hello TestSOAPInputMessage";
+ assertEquals("Response should be : Hello TestSOAPInputMessage",
expected, domResMsg.getNode()
+ .getFirstChild().getTextContent());
+ }
public void testJAXBObjectPAYLOAD() throws Exception {
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java?view=diff&rev=442803&r1=442802&r2=442803
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
Tue Sep 12 19:54:23 2006
@@ -47,13 +47,13 @@
private final QName serviceName = new
QName("http://apache.org/hello_world_xml_http/wrapped";,
"XMLService");
private final QName portName = new
QName("http://apache.org/hello_world_xml_http/wrapped";,
- "XMLPort");
+ "XMLDispatchPort");
public static class Server extends TestServerBase {
protected void run() {
Object implementor = new GreeterImpl();
- String address = "http://localhost:9000/XMLService/XMLPort";;
+ String address =
"http://localhost:9007/XMLService/XMLDispatchPort";;
Endpoint.publish(address, implementor);
}
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl?view=diff&rev=442803&r1=442802&r2=442803
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl
(original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl Tue
Sep 12 19:54:23 2006
@@ -285,6 +285,11 @@
</wsdl:port>
</wsdl:service>
+ <wsdl:service name="SOAPDispatchService">
+ <wsdl:port name="SoapDispatchPort" binding="tns:Greeter_SOAPBinding">
+ <soap:address
location="http://localhost:9006/SOAPDispatchService/SoapDispatchPort"/>
+ </wsdl:port>
+ </wsdl:service>
<wsdl:service name="SOAPService_DocLitBare">
<wsdl:port name="SoapPort2" binding="tns:Doc_Lit_Bare_SOAPBinding">
Modified:
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl?view=diff&rev=442803&r1=442802&r2=442803
==============================================================================
---
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
(original)
+++
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
Tue Sep 12 19:54:23 2006
@@ -1,158 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions name="HelloWorld"
targetNamespace="http://apache.org/hello_world_xml_http/wrapped";
- xmlns="http://schemas.xmlsoap.org/wsdl/";
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
- xmlns:tns="http://apache.org/hello_world_xml_http/wrapped";
-
xmlns:x1="http://apache.org/hello_world_xml_http/wrapped/types";
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns:xformat="http://cxf.apache.org/bindings/xmlformat";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
- <wsdl:types>
- <schema
targetNamespace="http://apache.org/hello_world_xml_http/wrapped/types";
- xmlns="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeOneWay">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="pingMe">
- <complexType/>
- </element>
- <element name="pingMeResponse">
- <complexType/>
- </element>
- <element name="faultDetail">
- <complexType>
- <sequence>
- <element name="minor" type="xsd:short"/>
- <element name="major" type="xsd:short"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeOneWayRequest">
- <wsdl:part element="x1:greetMeOneWay" name="in"/>
- </wsdl:message>
-
- <wsdl:message name="pingMeRequest">
- <wsdl:part name="in" element="x1:pingMe"/>
- </wsdl:message>
- <wsdl:message name="pingMeResponse">
- <wsdl:part name="out" element="x1:pingMeResponse"/>
- </wsdl:message>
- <wsdl:message name="pingMeFault">
- <wsdl:part name="faultDetail" element="x1:faultDetail"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- <wsdl:operation name="greetMeOneWay">
- <wsdl:input message="tns:greetMeOneWayRequest"
name="greetMeOneWayRequest"/>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
- <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
- <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
- </wsdl:operation>
-
- </wsdl:portType>
- <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
- <xformat:binding/>
-
- <wsdl:operation name="sayHi">
- <wsdl:input name="sayHiRequest"/>
- <wsdl:output name="sayHiResponse"/>
- </wsdl:operation>
+ http://www.apache.org/licenses/LICENSE-2.0
- <wsdl:operation name="greetMe">
- <wsdl:input name="greetMeRequest"/>
- <wsdl:output name="greetMeResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <wsdl:input name="greetMeOneWayRequest"/>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input/>
- <wsdl:output/>
- <wsdl:fault name="pingMeFault"/>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="XMLService">
- <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
- <http:address location="http://localhost:9000/XMLService/XMLPort"/>
- </wsdl:port>
- </wsdl:service>
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorld"
+ targetNamespace="http://apache.org/hello_world_xml_http/wrapped";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
+ xmlns:tns="http://apache.org/hello_world_xml_http/wrapped";
+ xmlns:x1="http://apache.org/hello_world_xml_http/wrapped/types";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xformat="http://cxf.apache.org/bindings/xmlformat";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <wsdl:types>
+ <schema
+
targetNamespace="http://apache.org/hello_world_xml_http/wrapped/types";
+ xmlns="http://www.w3.org/2001/XMLSchema";
+ elementFormDefault="qualified">
+ <element name="sayHi">
+ <complexType />
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType"
type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType"
type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType"
type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeOneWay">
+ <complexType>
+ <sequence>
+ <element name="requestType"
type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="pingMe">
+ <complexType />
+ </element>
+ <element name="pingMeResponse">
+ <complexType />
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor"
type="xsd:short" />
+ <element name="major"
type="xsd:short" />
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in" />
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out" />
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in" />
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out" />
+ </wsdl:message>
+ <wsdl:message name="greetMeOneWayRequest">
+ <wsdl:part element="x1:greetMeOneWay" name="in" />
+ </wsdl:message>
+
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe" />
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse" />
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail" />
+ </wsdl:message>
+
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest"
name="sayHiRequest" />
+ <wsdl:output message="tns:sayHiResponse"
+ name="sayHiResponse" />
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest"
+ name="greetMeRequest" />
+ <wsdl:output message="tns:greetMeResponse"
+ name="greetMeResponse" />
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input message="tns:greetMeOneWayRequest"
+ name="greetMeOneWayRequest" />
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest"
+ message="tns:pingMeRequest" />
+ <wsdl:output name="pingMeResponse"
+ message="tns:pingMeResponse" />
+ <wsdl:fault name="pingMeFault"
message="tns:pingMeFault" />
+ </wsdl:operation>
+
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
+ <xformat:binding />
+
+ <wsdl:operation name="sayHi">
+ <wsdl:input name="sayHiRequest" />
+ <wsdl:output name="sayHiResponse" />
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input name="greetMeRequest" />
+ <wsdl:output name="greetMeResponse" />
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input name="greetMeOneWayRequest" />
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input />
+ <wsdl:output />
+ <wsdl:fault name="pingMeFault" />
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="XMLService">
+ <wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
+ <http:address
+
location="http://localhost:9000/XMLService/XMLPort"; />
+ </wsdl:port>
+
+ <wsdl:port binding="tns:Greeter_XMLBinding"
name="XMLDispatchPort">
+ <http:address
+
location="http://localhost:9007/XMLService/XMLDispatchPort"; />
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
