Author: bfitzpat Date: 2011-05-11 13:39:47 -0400 (Wed, 11 May 2011) New Revision: 31216 Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java Log: OPEN - issue JBIDE-8927: WS Tester issues with JUnit tests after fixing JBDS-1602 https://issues.jboss.org/browse/JBIDE-8927 Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java =================================================================== --- branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11 16:55:52 UTC (rev 31215) +++ branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11 17:39:47 UTC (rev 31216) @@ -145,8 +145,8 @@ Vector<String> errorMessages = new Vector<String>(); definition_ = wsdlDefinition; + schemaList_ = new Vector<XSDSchema>(); - if (definition_ != null) { wsdlUrl_ = wsdlDefinition.getDocumentBaseURI(); @@ -332,7 +332,6 @@ private final static void gatherSchemas(Definition definition, String definitionURL) { - schemaList_ = new Vector<XSDSchema>(); Types types = definition.getTypes(); if (types != null) { @@ -350,15 +349,14 @@ if (isW3SchemaElementType(schemaElement.getElementType())) { xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement()); - if(!checkSchemaURI(definitionURL)){ - schemaList_.addElement(xsdSchema); - gatherSchemaDirective(xsdSchema, definitionURL); + if (xsdSchema != null) { + xsdSchema.update(); + xsdSchema.updateElement(); + if(!checkSchemaURI(definitionURL)){ + schemaList_.addElement(xsdSchema); + gatherSchemaDirective(xsdSchema, definitionURL); + } } - xsdSchema.update(); - xsdSchema.updateElement(); - //Add the Schema to the resource - // boolean success = resource.getContents().add(xsdSchema); - // System.out.println(success + "Added schema " + xsdSchema.getTargetNamespace() + " to wsdl resource " + uri.toString()); } } else if (obj instanceof UnknownExtensibilityElement) @@ -400,19 +398,22 @@ if (schemaURI != null) { schemaURI = normalize(schemaURI); - if(schemaURI.equals(normalize(wsdlUrl_)))return false; - Enumeration<String> e = schemaURI_.elements(); - while(e.hasMoreElements()){ - String uri = (String)e.nextElement(); - if(schemaURI.equals(uri)){ - found = true; - break; - } + if(schemaURI != null) { + if (schemaURI.equals(normalize(wsdlUrl_))) return false; + if (schemaURI_ == null) return false; + Enumeration<String> e = schemaURI_.elements(); + while(e.hasMoreElements()){ + String uri = (String)e.nextElement(); + if(schemaURI.equals(uri)){ + found = true; + break; + } + } + + if (!found){ + schemaURI_.addElement(schemaURI); + } } - - if (!found){ - schemaURI_.addElement(schemaURI); - } } return found; @@ -624,6 +625,9 @@ WSDLPartsToXSDTypeMapper mapper = new WSDLPartsToXSDTypeMapper(); mapper.addSchemas(schemaList_); XSDNamedComponent xsdComponent = mapper.getXSDTypeFromSchema(part); + if (xsdComponent == null) { + return "<error>Generating sample SOAP request</error>"; //$NON-NLS-1$ + } xsdComponent.updateElement(true); XSDSchema schema = xsdComponent.getSchema(); @@ -667,7 +671,9 @@ buf.append(createXMLForJDOMElement2( jdomSchemaElement2, child )); } } - } else { + } else if (part.getTypeName() != null && isTypeBaseXSDOrSimple(part.getTypeName().getNamespaceURI(), part.getTypeName().getLocalPart())) { + buf.append('<' + part.getName() + ">?</" + part.getName() + '>'); //$NON-NLS-1$ + } else { buf.append(createXMLForJDOMElement2( jdomSchemaElement, jdomElement )); } @@ -691,6 +697,10 @@ if (kidelement.getAttributeValue("name").equals(nstypename)) //$NON-NLS-1$ return kidelement; } + if (kidelement.getName().equals("simpleType")) { //$NON-NLS-1$ + if (kidelement.getAttributeValue("name").equals(nstypename)) //$NON-NLS-1$ + return kidelement; + } if (kidelement.getName().equals("attribute")) { //$NON-NLS-1$ if (kidelement.getAttributeValue("name").equals(nstypename)) //$NON-NLS-1$ return kidelement; @@ -712,6 +722,10 @@ if (kidelement.getAttributeValue("name").equals(name)) //$NON-NLS-1$ return kidelement; } + if (kidelement.getName().equals("simpleType")) { //$NON-NLS-1$ + if (kidelement.getAttributeValue("name").equals(name)) //$NON-NLS-1$ + return kidelement; + } if (kidelement.getName().equals("attribute")) { //$NON-NLS-1$ if (kidelement.getAttributeValue("name").equals(name)) //$NON-NLS-1$ return kidelement; @@ -993,8 +1007,28 @@ element2 = findJDOMElementInSchema(importXSDSchema, elemType); if (element2 != null) { element = element2; + } else { + element2 = findJDOMElementInSchemaByName(schemaElement, nstypename); + if (element2 != null) { + element = element2; + } } } + } else if (schemaElement != null) { + org.jdom.Element element2 = findJDOMTypeInSchema(schemaElement, elemType); + if (element2 != null) { + element = element2; + } else { + element2 = findJDOMElementInSchema(schemaElement, elemType); + if (element2 != null) { + element = element2; + } else { + element2 = findJDOMElementInSchemaByName(schemaElement, nstypename); + if (element2 != null) { + element = element2; + } + } + } } } if (element.getAttribute("ref") != null) {//$NON-NLS-1$ @@ -1043,6 +1077,14 @@ if (elemType != null && isTypeBaseXSDOrSimple(tns, elemType)) { isSimpleType = true; } + + boolean hasEnums = false; + if (element.getName().equals("simpleType")) { //$NON-NLS-1$ + String enums = getEnumerations(element); + if (enums != null && enums.trim().length() > 0) { + hasEnums = true; + } + } boolean includeTNSInRoot = false; if (rootIsQualified_ && !isQualified) { @@ -1051,6 +1093,9 @@ tnsprefix = "tns"; //$NON-NLS-1$ } else if (isQualified) { rootIsQualified_ = false; + if (tnsprefix == null) { + tnsprefix = "tns"; //$NON-NLS-1$ + } } boolean isSequence = element.getName().equals("sequence"); //$NON-NLS-1$ @@ -1084,7 +1129,7 @@ } - if (hasKids || isSimpleType) + if (hasKids || isSimpleType || hasEnums ) buf.append(">"); //$NON-NLS-1$ else buf.append("/>");//$NON-NLS-1$ @@ -1097,7 +1142,8 @@ List<?> kids = element.getChildren(); for (Iterator<?> kidIter = kids.iterator(); kidIter.hasNext(); ) { Element kid = (Element) kidIter.next(); - if (kid.getName().equals("complexType") || kid.getName().equals("sequence")) {//$NON-NLS-1$//$NON-NLS-2$ + if (kid.getName().equals("complexType") || kid.getName().equals("sequence") || //$NON-NLS-1$//$NON-NLS-2$ + kid.getName().equals("simpleType") || kid.getName().equals("restriction")) { //$NON-NLS-1$ //$NON-NLS-2$ List<?> innerkids = kid.getChildren(); for (Iterator<?> kidIter2 = innerkids.iterator(); kidIter2.hasNext(); ) { Element innerkid = (Element) kidIter2.next(); @@ -1111,9 +1157,9 @@ } } - if (!isSequence && ( hasKids || isSimpleType )) { + if (!isSequence && ( hasKids || isSimpleType || hasEnums )) { // add ? for value - if (!hasKids || isSimpleType) + if (!hasKids || isSimpleType || hasEnums ) buf.append('?'); // close tag @@ -1129,6 +1175,22 @@ return buf.toString(); } + private static String getEnumerations ( org.jdom.Element element ) { + StringBuffer buf = new StringBuffer(); + List<?> kids = element.getChildren(); + for (Iterator<?> kidIter = kids.iterator(); kidIter.hasNext(); ) { + Element kid = (Element) kidIter.next(); + if (kid.getChildren() != null && kid.getChildren().size() > 0) { + buf.append(getEnumerations(kid)); + } + if (kid.getName().equals("enumeration")) { //$NON-NLS-1$ + String value = kid.getAttributeValue("value"); //$NON-NLS-1$ + buf.append(value + '|'); + } + } + return buf.toString(); + } + private static HashMap<String, String> getDefinitionNamespaces ( Definition wsdlDefinition) { HashMap<String, String> namespaceMap = new HashMap<String, String>(); namespaceMap.put(SOAP_NS_URI, SOAP_PREFIX); @@ -1182,7 +1244,7 @@ DOMBuilder domBuilder = new DOMBuilder(); schema.updateElement(true); org.jdom.Element importXSDSchema = domBuilder.build(schema.getElement()); - if (type.indexOf(':') > -1) { + if (type != null && type.indexOf(':') > -1) { String typename = type.substring(type.indexOf(':') + 1, type.length()); org.jdom.Element element = findJDOMTypeInSchemaByNameAttr(importXSDSchema, typename); if (element != null) { @@ -1195,7 +1257,7 @@ // typically the type starts with a namespace prefix, so // we want to compare the end of the string with the actual // type name - if (type.endsWith(STRING_TYPE_NAME) || + if (type != null && type.endsWith(STRING_TYPE_NAME) || type.endsWith(BOOLEAN_TYPE_NAME) || type.endsWith(DECIMAL_TYPE_NAME) || type.endsWith(INT_TYPE_NAME) || @@ -1217,7 +1279,7 @@ type.endsWith(PRECISION_DECIMAL_TYPE_NAME) ) { return true; - } else if (type.contains(SIMPLE_TYPE_NAME)) { + } else if (type != null && type.contains(SIMPLE_TYPE_NAME)) { return true; } return false; Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,57 @@ +<definitions name="Converter" targetNamespace="http://test.jboss.org/ns" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns" version="1.0" xmlns:tns="http://test.jboss.org/ns" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="ChangeUnit"> + <xs:complexType> + <xs:sequence> + <xs:element name="value" type="xs:double"/> + <xs:element name="fromUnit" type="tns:Units"/> + <xs:element name="toUnit" type="tns:Units"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="ChangeUnitResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="ChangeUnitResult" type="xs:double"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:simpleType name="Units"> + <xs:restriction base="xs:string"> + <xs:enumeration value="kilometer"/> + <xs:enumeration value="meter"/> + </xs:restriction> + </xs:simpleType> + </xs:schema> + </types> + <message name="ConverterPortType_convertResponse"> + <part element="tns:ChangeUnitResponse" name="parameters"/> + </message> + <message name="ConverterPortType_convert"> + <part element="tns:ChangeUnit" name="parameters"/> + </message> + <portType name="ConverterPortType"> + <operation name="convert" parameterOrder="parameters"> + <input message="tns:ConverterPortType_convert"/> + <output message="tns:ConverterPortType_convertResponse"/> + </operation> + </portType> + <binding name="ConverterPortTypeBinding" type="tns:ConverterPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="convert"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="Converter"> + <port binding="tns:ConverterPortTypeBinding" name="ConverterPortTypeImplPort"> + <soap:address location="http://localhost:8080/SimpleWSWAR/ConverterPortType"/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,47 @@ +<definitions name="StockQuoteService" targetNamespace="http://www.jboss.com/webservices/StockQuoteService&... xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.jboss.com/webservices/StockQuoteService" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema targetNamespace="http://www.jboss.com/webservices/StockQuoteService&... version="1.0" xmlns:tns="http://www.jboss.com/webservices/StockQuoteService" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="getStockQuoteBySymbol" type="tns:getStockQuoteBySymbol"/> + <xs:element name="getStockQuoteBySymbolResponse" type="tns:getStockQuoteBySymbolResponse"/> + <xs:complexType name="getStockQuoteBySymbol"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="getStockQuoteBySymbolResponse"> + <xs:sequence> + <xs:element name="return" type="xs:float"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name="StockQuoteService_getStockQuoteBySymbol"> + <part element="tns:getStockQuoteBySymbol" name="getStockQuoteBySymbol"/> + </message> + <message name="StockQuoteService_getStockQuoteBySymbolResponse"> + <part element="tns:getStockQuoteBySymbolResponse" name="getStockQuoteBySymbolResponse"/> + </message> + <portType name="StockQuoteService"> + <operation name="getStockQuoteBySymbol" parameterOrder="getStockQuoteBySymbol"> + <input message="tns:StockQuoteService_getStockQuoteBySymbol"/> + <output message="tns:StockQuoteService_getStockQuoteBySymbolResponse"/> + </operation> + </portType> + <binding name="StockQuoteServiceBinding" type="tns:StockQuoteService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="getStockQuoteBySymbol"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="StockQuoteService"> + <port binding="tns:StockQuoteServiceBinding" name="StockQuoteServicePort"> + <soap:address location="http://localhost:8080/SimpleWSWAR/StockQuoteService"/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://test/" name="SampleWSService"> +<types> +<xsd:schema> +<xsd:import namespace="http://test/" schemaLocation="SampleWSService.xsd_1.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/ws/other" schemaLocation="SampleWSService.xsd_2.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/ws/b" schemaLocation="SampleWSService.xsd_3.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/ws/a" schemaLocation="SampleWSService.xsd_4.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/ws" schemaLocation="SampleWSService.xsd_5.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/attr/y" schemaLocation="SampleWSService.xsd_6.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/attr/x" schemaLocation="SampleWSService.xsd_7.xsd" /> +</xsd:schema> +<xsd:schema> +<xsd:import namespace="http://example.com/attr/other" schemaLocation="SampleWSService.xsd_8.xsd" /> +</xsd:schema> +</types> +<message name="echo"> +<part name="parameters" element="tns:echo" /> +</message> +<message name="echoResponse"> +<part name="parameters" element="tns:echoResponse" /> +</message> +<portType name="SampleWS"> +<operation name="echo"> +<input wsam:Action="http://test/SampleWS/echoRequest" message="tns:echo" /> +<output wsam:Action="http://test/SampleWS/echoResponse" message="tns:echoResponse" /> +</operation> +</portType> +<binding name="SampleWSPortBinding" type="tns:SampleWS"> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> +<operation name="echo"> +<soap:operation soapAction="" /> +<input> +<soap:body use="literal" /> +</input> +<output> +<soap:body use="literal" /> +</output> +</operation> +</binding> +<service name="SampleWSService"> +<port name="SampleWSPort" binding="tns:SampleWSPortBinding"> +<soap:address location="http://localhost:8080/A/SampleWSService" /> +</port> +</service> +</definitions> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:tns="http://test/" xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://test/"> + +<xs:import namespace="http://example.com/ws" schemaLocation="SampleWSService.xsd_5.xsd" /> + +<xs:element name="echo" type="tns:echo" /> + +<xs:element name="echoResponse" type="tns:echoResponse" /> + +<xs:complexType name="echo"> +<xs:sequence> +<xs:element name="arg0" type="ns1:someType" /> +</xs:sequence> +</xs:complexType> + +<xs:complexType name="echoResponse"> +<xs:sequence> +<xs:element name="return" type="ns1:someType" minOccurs="0" /> +</xs:sequence> +</xs:complexType> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/other"> + +<xs:import namespace="http://example.com/ws" schemaLocation="SampleWSService.xsd_5.xsd" /> + +<xs:element name="OtherType" type="ns1:otherType" /> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/b"> + +<xs:element name="B" type="xs:int" /> + +<xs:element name="description" type="xs:string" /> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/a"> + +<xs:element name="A" type="xs:int" /> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,34 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:tns="http://example.com/ws" xmlns:ns6="http://example.com/attr/other" xmlns:ns5="http://example.com/ws/other" xmlns:ns4="http://example.com/attr/y" xmlns:ns3="http://example.com/attr/x" xmlns:ns2="http://example.com/ws/b" xmlns:ns1="http://example.com/ws/a" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" version="1.0" targetNamespace="http://example.com/ws"> + +<xs:import namespace="http://example.com/ws/a" schemaLocation="SampleWSService.xsd_4.xsd" /> + +<xs:import namespace="http://example.com/ws/b" schemaLocation="SampleWSService.xsd_3.xsd" /> + +<xs:import namespace="http://example.com/attr/x" schemaLocation="SampleWSService.xsd_7.xsd" /> + +<xs:import namespace="http://example.com/attr/y" schemaLocation="SampleWSService.xsd_6.xsd" /> + +<xs:import namespace="http://example.com/ws/other" schemaLocation="SampleWSService.xsd_2.xsd" /> + +<xs:import namespace="http://example.com/attr/other" schemaLocation="SampleWSService.xsd_8.xsd" /> + +<xs:element name="SomeType" type="tns:someType" /> + +<xs:complexType name="someType"> +<xs:sequence> +<xs:element ref="ns1:A" /> +<xs:element ref="ns2:B" /> +<xs:element ref="ns5:OtherType" /> +</xs:sequence> +<xs:attribute ref="ns3:C" use="required" /> +<xs:attribute ref="ns4:D" use="required" /> +</xs:complexType> + +<xs:complexType name="otherType"> +<xs:sequence> +<xs:element ref="ns2:description" /> +</xs:sequence> +<xs:attribute ref="ns6:myid" /> +<xs:attribute ref="ns3:Y" use="required" /> +</xs:complexType> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/y"> + +<xs:attribute name="D" type="xs:int" /> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/x"> + +<xs:attribute name="C" type="xs:int" /> + +<xs:attribute name="Y" type="xs:int" /> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/other"> + +<xs:attribute name="myid" type="xs:string" /> +</xs:schema> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,22 @@ +<?xml version="1.0" ?> +<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"> + <S:Body> + <ns8:echo + xmlns:ns2="http://example.com/ws/b" + xmlns:ns3="http://example.com/attr/other" + xmlns:ns4="http://example.com/attr/x" + xmlns:ns5="http://example.com/ws/other" + xmlns:ns6="http://example.com/attr/y" + xmlns:ns7="http://example.com/ws/a" + xmlns:ns8="http://test/" + xmlns:ns9="http://example.com/ws"> + <arg0 ns6:D="4" ns4:C="3"> + <ns7:A>1</ns7:A> + <ns2:B>2</ns2:B> + <ns5:OtherType ns4:Y="5" ns3:myid="myID"> + <ns2:description>aDescription</ns2:description> + </ns5:OtherType> + </arg0> + </ns8:echo> + </S:Body> +</S:Envelope> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="SampleWSService" targetNamespace="http://test/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <wsdl:types> +<xs:schema elementFormDefault="qualified" targetNamespace="http://test/" version="1.0" xmlns:ns1="http://example.com/ws" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:import namespace="http://example.com/ws"/> +<xs:element name="echo" type="tns:echo"/> +<xs:element name="echoResponse" type="tns:echoResponse"/> +<xs:complexType name="echo"> +<xs:sequence> +<xs:element minOccurs="0" name="arg0" type="ns1:someType"/> +</xs:sequence> +</xs:complexType> +<xs:complexType name="echoResponse"> +<xs:sequence> +<xs:element minOccurs="0" name="return" type="ns1:someType"/> +</xs:sequence> +</xs:complexType> +</xs:schema> +<xs:schema targetNamespace="http://example.com/ws/other" version="1.0" xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:import namespace="http://example.com/ws"/> +<xs:element name="OtherType" type="ns1:otherType"/> +</xs:schema> +<xs:schema targetNamespace="http://example.com/ws/b" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:element name="B" type="xs:int"/> +<xs:element name="description" type="xs:string"/> +</xs:schema> +<xs:schema targetNamespace="http://example.com/ws/a" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:element name="A" type="xs:int"/> +</xs:schema> +<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com/ws" version="1.0" xmlns:ns1="http://example.com/ws/a" xmlns:ns2="http://example.com/ws/b" xmlns:ns3="http://example.com/attr/x" xmlns:ns4="http://example.com/attr/y" xmlns:ns5="http://example.com/ws/other" xmlns:ns6="http://example.com/attr/other" xmlns:tns="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:import namespace="http://example.com/ws/a"/> +<xs:import namespace="http://example.com/ws/b"/> +<xs:import namespace="http://example.com/attr/x"/> +<xs:import namespace="http://example.com/attr/y"/> +<xs:import namespace="http://example.com/ws/other"/> +<xs:import namespace="http://example.com/attr/other"/> +<xs:element name="SomeType" type="tns:someType"/> +<xs:complexType name="someType"> +<xs:sequence> +<xs:element ref="ns1:A"/> +<xs:element ref="ns2:B"/> +<xs:element minOccurs="0" ref="ns5:OtherType"/> +</xs:sequence> +<xs:attribute ref="ns3:C" use="required"/> +<xs:attribute ref="ns4:D" use="required"/> +</xs:complexType> +<xs:complexType name="otherType"> +<xs:sequence> +<xs:element minOccurs="0" ref="ns2:description"/> +</xs:sequence> +<xs:attribute ref="ns6:myid"/> +<xs:attribute ref="ns3:Y" use="required"/> +</xs:complexType> +</xs:schema> +<xs:schema targetNamespace="http://example.com/attr/y" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:attribute name="D" type="xs:int"/> +</xs:schema> +<xs:schema targetNamespace="http://example.com/attr/x" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:attribute name="C" type="xs:int"/> +<xs:attribute name="Y" type="xs:int"/> +</xs:schema> +<xs:schema targetNamespace="http://example.com/attr/other" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:attribute name="myid" type="xs:string"/> +</xs:schema> + </wsdl:types> + <wsdl:message name="echoResponse"> + <wsdl:part element="tns:echoResponse" name="parameters"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part element="tns:echo" name="parameters"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SampleWS"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SampleWSServiceSoapBinding" type="tns:SampleWS"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SampleWSService"> + <wsdl:port binding="tns:SampleWSServiceSoapBinding" name="SampleWSPort"> + <soap:address location="http://localhost:8080/ws/SampleWS"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"> + <soap:Body> + <ns7:echo xmlns:ns1="http://example.com/ws/a" xmlns:ns2="http://example.com/ws/b" + xmlns:ns3="http://example.com/attr/other" xmlns:ns4="http://example.com/attr/x" + xmlns:ns5="http://example.com/ws/other" xmlns:ns6="http://example.com/attr/y" + xmlns:ns7="http://test/" xmlns:ns8="http://example.com/ws"> + <ns7:arg0 ns4:C="3" ns6:D="4"> + <ns1:A>1</ns1:A> + <ns2:B>2</ns2:B> + <ns5:OtherType ns3:myid="myID" ns4:Y="5"> + <ns2:description>aDescription</ns2:description> + </ns5:OtherType> + </ns7:arg0> + </ns7:echo> + </soap:Body> +</soap:Envelope> \ No newline at end of file Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl (rev 0) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl 2011-05-11 17:39:47 UTC (rev 31216) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://www.example.org/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:basic="http://www.example.org/ws/basic/" + xmlns:extra="http://www.example.org/ws/extra/" xmlns:square="http://www.example.org/ws/square/" + xmlns:common="http://www.example.org/ws/common/" name="example" + targetNamespace="http://www.example.org/ws/"> + <wsdl:types> + <xsd:schema targetNamespace="http://www.example.org/ws/common/" + xmlns:tns="http://www.example.org/ws/common/"> + <xsd:element name="header" type="tns:headerType" /> + <xsd:complexType name="headerType"> + <xsd:sequence> + <xsd:element name="timestamp" type="xsd:dateTime" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + <xsd:schema targetNamespace="http://www.example.org/ws/square/" + xmlns:tns="http://www.example.org/ws/square/"> + <xsd:element name="square" type="tns:squareType" /> + <xsd:element name="squareResponse" type="tns:squareResponseType" /> + <xsd:element name="storeResult" type="tns:storeResultType" /> + <xsd:element name="storeHeader" type="tns:storeHeaderType" /> + <xsd:complexType name="squareType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:int" /> + <xsd:element name="b" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="squareResponseType"> + <xsd:sequence> + <xsd:element name="out" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="storeResultType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="storeHeaderType"> + <xsd:sequence> + <xsd:element name="id" type="xsd:string" /> + <xsd:element name="timestamp" type="xsd:dateTime" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + <xsd:schema targetNamespace="http://www.example.org/ws/basic/" + xmlns:tns="http://www.example.org/ws/basic/"> + <xsd:import namespace="http://www.example.org/ws/common/" /> + <xsd:element name="operationRequest" type="tns:requestType" /> + <xsd:element name="operationResponse" type="tns:responseType" /> + <xsd:element name="invalidNumberFault" type="tns:faultType" /> + <xsd:complexType name="requestType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:float" /> + <xsd:element name="b" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="responseType"> + <xsd:sequence> + <xsd:element name="out" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="faultType"> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" /> + <xsd:element name="details" type="xsd:string" /> + <xsd:element name="a" type="xsd:float" /> + <xsd:element name="b" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + <xsd:schema targetNamespace="http://www.example.org/ws/extra/" + xmlns:tns="http://www.example.org/ws/extra/"> + <xsd:import namespace="http://www.example.org/ws/common/" /> + <xsd:element name="operationRequest" type="tns:requestType" /> + <xsd:element name="operationResponse" type="tns:responseType" /> + <xsd:element name="invalidNumberFault" type="tns:faultType" /> + <xsd:complexType name="requestType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:double" /> + <xsd:element name="b" type="xsd:double" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="responseType"> + <xsd:sequence> + <xsd:element name="out" type="xsd:double" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="faultType"> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" /> + <xsd:element name="details" type="xsd:string" /> + <xsd:element name="a" type="xsd:double" /> + <xsd:element name="b" type="xsd:double" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </wsdl:types> + <wsdl:message name="storeHeader"> + <wsdl:part name="storeHeader" element="square:storeHeader" /> + </wsdl:message> + <wsdl:message name="minusOperationRequest"> + <wsdl:part name="parameters" element="basic:operationRequest" /> + <wsdl:part name="header" element="common:header" /> + </wsdl:message> + <wsdl:message name="minusOperationResponse"> + <wsdl:part name="parameters" element="basic:operationResponse" /> + </wsdl:message> + <wsdl:message name="invalidNumberFaultBasic"> + <wsdl:part name="parameters" element="basic:invalidNumberFault" /> + </wsdl:message> + <wsdl:message name="invalidNumberFaultExtra"> + <wsdl:part name="parameters" element="extra:invalidNumberFault" /> + </wsdl:message> + <wsdl:portType name="minusPortType"> + <wsdl:operation name="minusOperation"> + <wsdl:input message="tns:minusOperationRequest" name="minusOperationRequest" /> + <wsdl:output message="tns:minusOperationResponse" name="minusOperationResponse" /> + <wsdl:fault message="tns:invalidNumberFaultBasic" name="invalidNumberFault" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="minusSOAP" type="tns:minusPortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="minusOperation"> + <soap:operation soapAction="http://www.example.org/ws/minusOperation" /> + <wsdl:input> + <soap:header message="tns:storeHeader" part="storeHeader" + use="literal" /> + <soap:body parts="parameters" use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="basic"> + <wsdl:port name="minusPort" binding="tns:minusSOAP"> + <soap:address location="http://www.example.org/" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java =================================================================== --- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-05-11 16:55:52 UTC (rev 31215) +++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-05-11 17:39:47 UTC (rev 31216) @@ -17,6 +17,7 @@ import javax.wsdl.Definition; import javax.wsdl.WSDLException; +import org.jboss.tools.ws.ui.utils.SchemaUtils; import org.jboss.tools.ws.ui.utils.TesterWSDLUtils; import org.junit.Assert; import org.junit.Test; @@ -68,48 +69,53 @@ @Test public void testJBIDE6497() { String s1 = getSampleMessage("/jbide6497/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); - Assert.assertTrue("was: '" + s1, s1.contains("<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">")); - Assert.assertTrue("was: '" + s1, s1.contains("<gQuery>?</gQuery>")); + Assert.assertTrue("was: '" + s1, s1.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">")); + Assert.assertTrue("was: '" + s1, s1.contains("<tns:gQuery>?</tns:gQuery>")); s1 = getSampleMessage("/jbide6593/original.wsdl", "EchoService", "EchoPort", "EchoPortBinding", "echo"); - Assert.assertTrue("was: '" + s1, s1.contains("<p><age>?</age>")); + Assert.assertTrue("was: '" + s1, s1.contains("<ns:p>\n<age>?</age>")); Assert.assertTrue("was: '" + s1, s1.contains("<male>?</male>")); Assert.assertTrue("was: '" + s1, s1.contains("<tax>?</tax>")); - Assert.assertTrue("was: '" + s1, s1.contains("<echo xmlns = \"http://test.jboss.org/ns\">")); + Assert.assertTrue("was: '" + s1, s1.contains("<ns:echo xmlns:ns=\"http://test.jboss.org/ns\">")); } @Test public void testJBIDE6558() { String s1 = getSampleMessage("/jbide6558/x.wsdl", "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); - Assert.assertTrue(s1.contains("xmlns = \"http://webservices.samples.jboss.org/\"")); - Assert.assertTrue(s1.contains("<arg0>?</arg0>")); + Assert.assertTrue(s1.contains("xmlns:tns=\"http://webservices.s...; + Assert.assertTrue(s1.contains("<tns:arg0>?</tns:arg0>")); String s2 = getSampleMessage("/jbide6558/y.wsdl", "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); - Assert.assertEquals(s1, s2); + Assert.assertTrue(s2.contains("xmlns:webs=\"http://webservices....; + Assert.assertTrue(s2.contains("<arg0>?</arg0>")); + // won't be equal due to the namespacing + //Assert.assertEquals(s1, s2); } @Test public void testJBIDE6593() { String s1 = getSampleMessage("/jbide6497/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); - Assert.assertTrue(s1.contains("<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">")); - Assert.assertTrue(s1.contains("<gQuery>?</gQuery>")); + Assert.assertTrue(s1.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">")); + Assert.assertTrue(s1.contains("<tns:gQuery>?</tns:gQuery>")); String s2 = getSampleMessage("/jbide6593/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); +// Assert.assertTrue(s2.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">")); +// Assert.assertTrue(s2.contains("<tns:gQuery>?</tns:gQuery>")); Assert.assertEquals(s1, s2); } @Test public void testJBIDE6694() { String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert"); - Assert.assertTrue(s1.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">")); - Assert.assertTrue(s1.contains("<value>?</value>")); - Assert.assertTrue(s1.contains("<fromUnit>?</fromUnit>")); - Assert.assertTrue(s1.contains("<toUnit>?</toUnit>")); + Assert.assertTrue(s1.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">")); + Assert.assertTrue(s1.contains("<tns:value>?</tns:value>")); + Assert.assertTrue(s1.contains("<tns:fromUnit>?</tns:fromUnit>")); + Assert.assertTrue(s1.contains("<tns:toUnit>?</tns:toUnit>")); String s2 = getSampleMessage("/jbide6694/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert"); - Assert.assertTrue(s2.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">")); - Assert.assertTrue(s2.contains("<value>?</value>")); - Assert.assertTrue(s2.contains("<fromUnit>?</fromUnit>")); - Assert.assertTrue(s2.contains("<toUnit>?</toUnit>")); + Assert.assertTrue(s2.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">")); + Assert.assertTrue(s2.contains("<tns:value>?</tns:value>")); + Assert.assertTrue(s2.contains("<tns:fromUnit>?</tns:fromUnit>")); + Assert.assertTrue(s2.contains("<tns:toUnit>?</tns:toUnit>")); } @Test @@ -117,16 +123,45 @@ String s1 = getSampleMessage("/jbide6865/wsdl1.wsdl", "DirectFlight", "DirectFlightSoap", "FlightAwareDirectFlight:DirectFlightSoap", "AirportInfo"); Assert.assertTrue(s1.contains("<airportCode>?</airportCode>")); } + + @Test + public void testJBDS1602() { + String s1 = getSampleMessage("/jbds1602/StockQuoteService.wsdl", "StockQuoteService", "StockQuoteServicePort", "tns:StockQuoteServiceBinding", "getStockQuoteBySymbol"); + Assert.assertTrue(s1.contains("<stoc:getStockQuoteBySymbol xmlns:stoc=\"http://www.jboss.com/webservices/StockQuoteService\&quo...; + Assert.assertTrue(s1.contains("<arg0>?</arg0>")); + String s2 = getSampleMessage("/jbds1602/jb/SampleWS.wsdl", "SampleWSService", "SampleWSPort", "tns:SampleWSServiceSoapBinding", "echo"); + Assert.assertTrue(s2.contains("<test:echo xmlns:test=\"http://test/\">")); + Assert.assertTrue(s2.contains("<test:arg0 xmlns:x=\"http://example.com/attr/x\" x:C=\"?\" xmlns:y=\"http://example.com/attr/y\" y:D=\"?\" >")); + Assert.assertTrue(s2.contains("<othe:OtherType xmlns:othe=\"http://example.com/attr/other\" othe:myid=\"?\" x:Y=\"?\" >")); + Assert.assertTrue(s2.contains("<b:description>?</b:description>")); + } + + @Test + public void testJBIDE8770() { + String s1 = getSampleMessage("/jbide8770/parts.wsdl", "basic", "minusPort", "minusSOAP", "minusOperation"); + Assert.assertTrue(s1.contains("<basi:operationRequest xmlns:basi=\"http://www.example.org/ws/basic/\">")); + Assert.assertTrue(s1.contains("<a>?</a>")); + + String s2 = getSampleMessageHeader("/jbide8770/parts.wsdl", "basic", "minusPort", "minusSOAP", "minusOperation"); + Assert.assertTrue(s2.contains("<squa:storeHeader xmlns:squa=\"http://www.example.org/ws/square/\">")); + Assert.assertTrue(s2.contains("<timestamp>?</timestamp>")); + } + private String getSampleMessage(String res, String service, String port, String binding, String operation) { Definition def = readWSDL(res); - return TesterWSDLUtils.getSampleSOAPInputMessage(def, service, port, binding, operation); + return SchemaUtils.getSampleSOAPInputMessage(def, service, port, binding, operation); } + private String getSampleMessageHeader(String res, String service, String port, String binding, String operation) { + Definition def = readWSDL(res); + return SchemaUtils.getSampleSOAPMessageHeader(def, service, port, binding, operation); + } + private Definition readWSDL(String path) { try { - URL url = TesterWSDLUtilsTest.class.getResource(path).toURI().toURL(); - return TesterWSDLUtils.readWSDLURL(url); + URL url = SchemaUtils.class.getResource(path).toURI().toURL(); + return SchemaUtils.readWSDLURL(url); } catch (MalformedURLException e) { e.printStackTrace(); Assert.fail(e.getMessage());