[jbossws-commits] JBossWS SVN: r6602 - framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl.

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 23:57:32 -0400 (Mon, 21 Apr 2008) New Revision: 6602 Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl Log: Revert changes to wsdl Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd 2008-04-22 03:46:15 UTC (rev 6601) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd 2008-04-22 03:57:32 UTC (rev 6602) @@ -1,24 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema targetNamespace="urn:BaseComponents" elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns:cc="urn:CoreComponentTypes" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> - <xs:simpleType name="CountryCodeType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="DE"/> - <xs:enumeration value="CZ"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="CurrencyCodeType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="CZK"/> - <xs:enumeration value="EUR"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="RequestType"> - <xs:restriction base="cc:CountryType"/> - </xs:simpleType> - <xs:simpleType name="ResponseType"> - <xs:restriction base="cc:CurrencyType"/> - </xs:simpleType> -</xs:schema> +<xs:schema targetNamespace="urn:BaseComponents" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:cc="urn:CoreComponentTypes" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> + <xs:simpleType name="CountryCodeType"> + <xs:restriction base="xs:token"> + <xs:enumeration value="DE"/> + <xs:enumeration value="CZ"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="CurrencyCodeType"> + <xs:restriction base="xs:token"> + <xs:enumeration value="CZK"/> + <xs:enumeration value="EUR"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="RequestType"> + <xs:restriction base="cc:CountryType"/> + </xs:simpleType> + <xs:simpleType name="ResponseType"> + <xs:restriction base="cc:CurrencyType"/> + </xs:simpleType> +</xs:schema> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd 2008-04-22 03:46:15 UTC (rev 6601) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd 2008-04-22 03:57:32 UTC (rev 6602) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns:bc="urn:BaseComponents" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> - <xs:simpleType name="CountryType"> - <xs:restriction base="bc:CountryCodeType"/> - </xs:simpleType> - <xs:simpleType name="CurrencyType"> - <xs:restriction base="bc:CurrencyCodeType"/> - </xs:simpleType> -</xs:schema> +<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:bc="urn:BaseComponents" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> + <xs:simpleType name="CountryType"> + <xs:restriction base="bc:CountryCodeType"/> + </xs:simpleType> + <xs:simpleType name="CurrencyType"> + <xs:restriction base="bc:CurrencyCodeType"/> + </xs:simpleType> +</xs:schema> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl 2008-04-22 03:46:15 UTC (rev 6601) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl 2008-04-22 03:57:32 UTC (rev 6602) @@ -1,133 +1,116 @@ -<?xml version='1.0' encoding='utf-8' ?> -<definitions name='EndpointService' targetNamespace='http://jbws1843.jaxws.ws.test.jboss.org/' - xmlns:tns='http://jbws1843.jaxws.ws.test.jboss.org/' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:cc="urn:CoreComponentTypes" - xmlns:bc="urn:BaseComponents" - xmlns='http://schemas.xmlsoap.org/wsdl/'> - <types> - <xsd:schema elementFormDefault="qualified" - targetNamespace="http://jbws1843.jaxws.ws.test.jboss.org/" - xmlns:tns="http://jbws1843.jaxws.ws.test.jboss.org/" - xmlns:xns4="http://jbws1843.jaxws.ws.test.jboss.org/java/lang/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> - <xsd:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> - <xsd:element name="getCountryCodes"> - <xsd:complexType> - <xsd:sequence/> - </xsd:complexType> +<?xml version='1.0' encoding='utf-8'?> +<definitions name='Service' targetNamespace='http://jbws1843.jaxws.ws.test.jboss.org/' xmlns:tns='http://jbws1843.jaxws.ws.test.jboss.org/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:cc="urn:CoreComponentTypes" xmlns:bc="urn:BaseComponents" xmlns='http://schemas.xmlsoap.org/wsdl/'> + <types> + <xsd:schema elementFormDefault="qualified" targetNamespace="http://jbws1843.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws1843.jaxws.ws.test.jboss.org/" + xmlns:xns4="http://jbws1843.jaxws.ws.test.jboss.org/java/lang/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <xsd:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> + <xsd:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> + <xsd:element name="getCountryCodes"> + <xsd:complexType> + <xsd:sequence/> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCurrencyCodes"> + <xsd:complexType> + <xsd:sequence/> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCountryCodesResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="response" nillable="false"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="1" name="country" nillable="true" type="bc:CountryCodeType"/> + </xsd:sequence> + </xsd:complexType> </xsd:element> - <xsd:element name="getCurrencyCodes"> - <xsd:complexType> - <xsd:sequence/> - </xsd:complexType> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCurrency" type="bc:RequestType"/> + <xsd:element name="getCurrencyResponse" type="bc:ResponseType"/> + <xsd:element name="getCurrencyCodesResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="response" nillable="false"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="1" name="currency" nillable="true" type="bc:CurrencyCodeType"/> + </xsd:sequence> + </xsd:complexType> </xsd:element> - <xsd:element name="getCountryCodesResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="response" nillable="false"> - <xsd:complexType> - <xsd:sequence> - <xsd:element - maxOccurs="unbounded" - minOccurs="1" - name="country" - nillable="true" - type="bc:CountryCodeType"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="getCurrency" type="bc:RequestType"/> - <xsd:element name="getCurrencyResponse" type="bc:ResponseType"/> - <xsd:element name="getCurrencyCodesResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="response" nillable="false"> - <xsd:complexType> - <xsd:sequence> - <xsd:element - maxOccurs="unbounded" - minOccurs="1" - name="currency" - nillable="true" - type="bc:CurrencyCodeType"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:schema> - </types> - <message name='Service_getCountryCodes_Request_Soap'> - <part name='parameters' element='tns:getCountryCodes'/> - </message> - <message name='Service_getCountryCodes_Response_Soap'> - <part name='parameters' element='tns:getCountryCodesResponse'/> - </message> - <message name='Service_getCurrencyCodes_Request_Soap'> - <part name='parameters' element='tns:getCurrencyCodes'/> - </message> - <message name='Service_getCurrencyCodes_Response_Soap'> - <part name='parameters' element='tns:getCurrencyCodesResponse'/> - </message> - <message name='Service_getCurrency_Request_Soap'> - <part name='parameters' element='tns:getCurrency'/> - </message> - <message name='Service_getCurrency_Response_Soap'> - <part name='parameters' element='tns:getCurrencyResponse'/> - </message> - <portType name='EndpointService'> - <operation name='getCountryCodes'> - <input message='tns:Service_getCountryCodes_Request_Soap'/> - <output message='tns:Service_getCountryCodes_Response_Soap'/> - </operation> - <operation name='getCurrency'> - <input message='tns:Service_getCurrency_Request_Soap'/> - <output message='tns:Service_getCurrency_Response_Soap'/> - </operation> - <operation name='getCurrencyCodes'> - <input message='tns:Service_getCurrencyCodes_Request_Soap'/> - <output message='tns:Service_getCurrencyCodes_Response_Soap'/> - </operation> - </portType> - <binding name='EndpointService' type='tns:Service'> - <soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='document'/> - <operation name='getCountryCodes'> - <soap:operation soapAction='countryCodesAction' style='document'/> - <input> - <soap:body parts='parameters' use='literal'/> - </input> - <output> - <soap:body parts='parameters' use='literal'/> - </output> - </operation> - <operation name='getCurrency'> - <soap:operation soapAction='currencyAction' style='document'/> - <input> - <soap:body parts='parameters' use='literal'/> - </input> - <output> - <soap:body parts='parameters' use='literal'/> - </output> - </operation> - <operation name='getCurrencyCodes'> - <soap:operation soapAction='currencyCodesAction' style='document'/> - <input> - <soap:body parts='parameters' use='literal'/> - </input> - <output> - <soap:body parts='parameters' use='literal'/> - </output> - </operation> - </binding> - <service name='EndpointService'> - <port name='EndpointService' binding='tns:Service'> - <soap:address location='http:unknown-location-uri'/> - </port> - </service> -</definitions> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:schema> + </types> + <message name='Service_getCountryCodes_Request_Soap'> + <part name='parameters' element='tns:getCountryCodes'/> + </message> + <message name='Service_getCountryCodes_Response_Soap'> + <part name='parameters' element='tns:getCountryCodesResponse'/> + </message> + <message name='Service_getCurrencyCodes_Request_Soap'> + <part name='parameters' element='tns:getCurrencyCodes'/> + </message> + <message name='Service_getCurrencyCodes_Response_Soap'> + <part name='parameters' element='tns:getCurrencyCodesResponse'/> + </message> + <message name='Service_getCurrency_Request_Soap'> + <part name='parameters' element='tns:getCurrency'/> + </message> + <message name='Service_getCurrency_Response_Soap'> + <part name='parameters' element='tns:getCurrencyResponse'/> + </message> + <portType name='Service'> + <operation name='getCountryCodes'> + <input message='tns:Service_getCountryCodes_Request_Soap'/> + <output message='tns:Service_getCountryCodes_Response_Soap'/> + </operation> + <operation name='getCurrency'> + <input message='tns:Service_getCurrency_Request_Soap'/> + <output message='tns:Service_getCurrency_Response_Soap'/> + </operation> + <operation name='getCurrencyCodes'> + <input message='tns:Service_getCurrencyCodes_Request_Soap'/> + <output message='tns:Service_getCurrencyCodes_Response_Soap'/> + </operation> + </portType> + <binding name='Service' type='tns:Service'> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='document'/> + <operation name='getCountryCodes'> + <soap:operation soapAction='countryCodesAction' style='document'/> + <input> + <soap:body parts='parameters' use='literal'/> + </input> + <output> + <soap:body parts='parameters' use='literal'/> + </output> + </operation> + <operation name='getCurrency'> + <soap:operation soapAction='currencyAction' style='document'/> + <input> + <soap:body parts='parameters' use='literal'/> + </input> + <output> + <soap:body parts='parameters' use='literal'/> + </output> + </operation> + <operation name='getCurrencyCodes'> + <soap:operation soapAction='currencyCodesAction' style='document'/> + <input> + <soap:body parts='parameters' use='literal'/> + </input> + <output> + <soap:body parts='parameters' use='literal'/> + </output> + </operation> + </binding> + <service name='Service'> + <port name='Service' binding='tns:Service'> + <soap:address location='http:unknown-location-uri'/> + </port> + </service> +</definitions> \ No newline at end of file