Author: richard.opalka(a)jboss.com Date: 2008-04-22 06:44:33 -0400 (Tue, 22 Apr 2008) New Revision: 6609 Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/AddressingService.wsdl Removed: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java Log: [JBWS-2100] refactoring Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java 2008-04-22 10:13:12 UTC (rev 6608) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java 2008-04-22 10:44:33 UTC (rev 6609) @@ -21,21 +21,18 @@ */ package org.jboss.test.ws.jaxws.samples.wsaddressing; -import javax.jws.WebMethod; import javax.jws.WebService; @WebService ( - name = "AddressingServiceName", portName = "AddressingServicePort", serviceName = "AddressingService", - wsdlLocation = "WEB-INF/wsdl/Service.wsdl", + wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", endpointInterface = "org.jboss.test.ws.jaxws.samples.wsaddressing.ServiceIface" ) public class ServiceImpl implements ServiceIface { - @WebMethod public String sayHello() { return "Hello World!"; Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/AddressingService.wsdl =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/AddressingService.wsdl (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/AddressingService.wsdl 2008-04-22 10:44:33 UTC (rev 6609) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddres... xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing&q... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <wsdl:types> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing&q... attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddres... +<xsd:element name="sayHello" type="tns:sayHello"/> +<xsd:complexType name="sayHello"> +<xsd:sequence/> +</xsd:complexType> +<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> +<xsd:complexType name="sayHelloResponse"> +<xsd:sequence> +<xsd:element minOccurs="0" name="return" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +</xsd:schema> + </wsdl:types> + <wsdl:message name="sayHelloResponse"> + <wsdl:part name="parameters" element="tns:sayHelloResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHello"> + <wsdl:part name="parameters" element="tns:sayHello"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="ServiceIface"> + <wsdl:operation name="sayHello"> + <wsdl:input name="sayHello" message="tns:sayHello"> + </wsdl:input> + <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="sayHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="sayHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="AddressingService"> + <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding"> + <soap:address location="http://localhost:9090/hello"/> + <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/AddressingService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl 2008-04-22 10:13:12 UTC (rev 6608) +++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl 2008-04-22 10:44:33 UTC (rev 6609) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddres... xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing&q... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing&q... attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddres... -<xsd:element name="sayHello" type="tns:sayHello"/> -<xsd:complexType name="sayHello"> -<xsd:sequence/> -</xsd:complexType> -<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> -<xsd:complexType name="sayHelloResponse"> -<xsd:sequence> -<xsd:element minOccurs="0" name="return" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -</xsd:schema> - </wsdl:types> - <wsdl:message name="sayHelloResponse"> - <wsdl:part name="parameters" element="tns:sayHelloResponse"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="sayHello"> - <wsdl:part name="parameters" element="tns:sayHello"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="ServiceIface"> - <wsdl:operation name="sayHello"> - <wsdl:input name="sayHello" message="tns:sayHello"> - </wsdl:input> - <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="sayHello"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="sayHello"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="sayHelloResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressingService"> - <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding"> - <soap:address location="http://localhost:9090/hello"/> - <UsingAddressing xmlns="http://www.w3.org/2005/02/addressing/wsdl"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions>