### Eclipse Workspace Patch 1.0
#P org.jboss.tools.ws.ui
Index: src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
--- src/org/jboss/tools/ws/ui/utils/SchemaUtils.java	(revision 31198)
+++ src/org/jboss/tools/ws/ui/utils/SchemaUtils.java	(working copy)
@@ -671,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 ));
 		}
 
@@ -1075,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) {
@@ -1083,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$
@@ -1116,7 +1129,7 @@
 			}
 
 			
-			if (hasKids || isSimpleType)
+			if (hasKids || isSimpleType || hasEnums )
 				buf.append(">"); //$NON-NLS-1$
 			else
 				buf.append("/>");//$NON-NLS-1$
@@ -1144,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
@@ -1162,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);
#P org.jboss.tools.ws.ui.test
Index: src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
===================================================================
--- src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java	(revision 31199)
+++ src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java	(working copy)
@@ -100,39 +100,66 @@
 		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);
+//		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() {
-		/*STILL WORKING ON THIS ONE*/
-//		String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert");
-//		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>"));
+		String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert");
+		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("<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
 	public void testJBIDE6865() {
-		/*STILL WORKING ON THIS ONE*/
-//		String s1 = getSampleMessage("/jbide6865/wsdl1.wsdl", "DirectFlight", "DirectFlightSoap", "FlightAwareDirectFlight:DirectFlightSoap", "AirportInfo");
-//		Assert.assertTrue(s1.contains("<airportCode>?</airportCode>"));
+		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\">"));
+		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 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 = SchemaUtils.class.getResource(path).toURI().toURL();
Index: resources/jbide8770/parts.wsdl
===================================================================
--- resources/jbide8770/parts.wsdl	(revision 0)
+++ resources/jbide8770/parts.wsdl	(revision 0)
@@ -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>