Author: richard.opalka(a)jboss.com Date: 2009-01-06 06:38:50 -0500 (Tue, 06 Jan 2009) New Revision: 8964 Added: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd Removed: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/schema/ Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl Log: [JBWS-2437] updating test Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl 2009-01-06 09:37:55 UTC (rev 8963) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl 2009-01-06 11:38:50 UTC (rev 8964) @@ -5,7 +5,7 @@ <xsd:schema elementFormDefault="qualified" targetNamespace="http://jbws2009.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws2009.jaxws.ws.test.jboss.org/" xmlns:xns4="http://jbws2009.jaxws.ws.test.jboss.org/java/lang/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:import namespace="urn:BaseComponents" schemaLocation="../schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/> + <xsd:import namespace="urn:BaseComponents" schemaLocation="./schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/> <xsd:element name="getCountryCodes"> <xsd:complexType> Added: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd 2009-01-06 11:38:50 UTC (rev 8964) @@ -0,0 +1,12 @@ +<?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="../../imported/my-service/1.0-SNAPSHOT/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> Added: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd 2009-01-06 11:38:50 UTC (rev 8964) @@ -0,0 +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="../../../common/1.0-SNAPSHOT/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