Index: src/com/ibm/wsdl/BindingImpl.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/BindingImpl.java,v
retrieving revision 1.1.1.1
diff -w -u -r1.1.1.1 BindingImpl.java
--- src/com/ibm/wsdl/BindingImpl.java	20 Jun 2001 14:03:40 -0000	1.1.1.1
+++ src/com/ibm/wsdl/BindingImpl.java	18 Jun 2002 16:41:28 -0000
@@ -90,6 +90,8 @@
 											                        String inputName,
 											                        String outputName)
   {
+  	BindingOperation bo = null;
+  	boolean found = false;
   	Iterator opBindingIterator = bindingOperations.iterator();
 
     while (opBindingIterator.hasNext())
@@ -117,15 +119,11 @@
         {
           String opInputName = input.getName();
 
-          if (opInputName == null || !opInputName.equals(inputName))
+          if (opInputName != null && !opInputName.equals(inputName))
           {
             op = null;
           }
         }
-        else
-        {
-          op = null;
-        }
 	    }
 
       if (op != null && outputName != null)
@@ -136,24 +134,28 @@
         {
           String opOutputName = output.getName();
 
-          if (opOutputName == null || !opOutputName.equals(outputName))
+          if (opOutputName != null && !opOutputName.equals(outputName))
           {
             op = null;
           }
         }
-        else
-        {
-          op = null;
-        }
       }
 
       if (op != null)
       {
-        return op;
+	  	if (found == true)
+	  	{
+	  		return null; //throw an exception??????
+	  	}
+	  	else
+	  	{
+	  	  found = true;
+	  	  bo = op;
+	  	}	  	
       }
     }
 
-  	return null;
+  	return bo;
   }  
 
   /**
Index: src/com/ibm/wsdl/Constants.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/Constants.java,v
retrieving revision 1.4
diff -w -u -r1.4 Constants.java
--- src/com/ibm/wsdl/Constants.java	25 Jan 2002 04:25:47 -0000	1.4
+++ src/com/ibm/wsdl/Constants.java	18 Jun 2002 16:41:28 -0000
@@ -88,4 +88,6 @@
   public static final String FEATURE_VERBOSE = "javax.wsdl.verbose";
   public static final String FEATURE_IMPORT_DOCUMENTS =
     "javax.wsdl.importDocuments";
+  public static final String FEATURE_TOLERATE_UNQUALIFIED_QNAMES =
+    "javax.wsdl.tolerateUnqualifiedQNames";
 }
Index: src/com/ibm/wsdl/DefinitionImpl.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/DefinitionImpl.java,v
retrieving revision 1.5
diff -w -u -r1.5 DefinitionImpl.java
--- src/com/ibm/wsdl/DefinitionImpl.java	18 Jan 2002 21:24:43 -0000	1.5
+++ src/com/ibm/wsdl/DefinitionImpl.java	18 Jun 2002 16:41:29 -0000
@@ -4,6 +4,7 @@
 import org.w3c.dom.*;
 import javax.wsdl.*;
 import javax.wsdl.extensions.*;
+import com.ibm.wsdl.util.StringUtils;
 import com.ibm.wsdl.util.xml.*;
 
 /**
@@ -166,7 +167,7 @@
        String prefix = (String)entry.getKey();
        String assocNamespaceURI = (String)entry.getValue();
 
-       if (namespaceURI.equals(assocNamespaceURI))
+       if (StringUtils.areURIsEquivalent(namespaceURI, assocNamespaceURI))
        {
          return prefix;
        }
Index: src/com/ibm/wsdl/PartImpl.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/PartImpl.java,v
retrieving revision 1.1.1.1
diff -w -u -r1.1.1.1 PartImpl.java
--- src/com/ibm/wsdl/PartImpl.java	20 Jun 2001 14:03:40 -0000	1.1.1.1
+++ src/com/ibm/wsdl/PartImpl.java	18 Jun 2002 16:41:29 -0000
@@ -2,6 +2,7 @@
 
 import org.w3c.dom.*;
 import javax.wsdl.*;
+import java.util.*;
 
 /**
  * This class represents a message part and contains the part's
@@ -17,6 +18,7 @@
   protected QName elementName = null;
   protected QName typeName = null;
   protected Element docEl = null;
+  protected HashMap extAttrMap = new HashMap();
 
   /**
    * Set the name of this part.
@@ -98,6 +100,43 @@
       strBuf.append("\ntypeName=" + typeName);
     }
 
+    Iterator extAtts = getExtensionAttributeNames();
+	while (extAtts.hasNext())
+	{
+		QName aName = (QName) extAtts.next();
+		QName aValue = (QName) getExtensionAttribute(aName);
+		strBuf.append("\n"+aName+"="+aValue);
+	}
+	
     return strBuf.toString();
+  }
+  
+  public void setExtensionAttribute(QName name, QName value)
+  	throws WSDLException
+  {
+  	String lName = name.getLocalPart();
+  	String nSpace = name.getNamespaceURI();
+  	if (lName == null) return;
+  	if ((nSpace.equals("") || nSpace.equals(Constants.NS_URI_WSDL))
+  		&& (lName.equals(Constants.ATTR_NAME)
+		|| lName.equals(Constants.ATTR_ELEMENT)
+		|| lName.equals(Constants.ATTR_TYPE)))
+	{
+		throw new WSDLException(
+			WSDLException.OTHER_ERROR,
+			"Extension attribute duplicates standard attribute.");
+	}
+  	if (value == null) extAttrMap.remove(name);
+  	else extAttrMap.put(name, value);
+  }
+  
+  public Iterator getExtensionAttributeNames()
+  {
+  	return extAttrMap.keySet().iterator();
+  }
+  
+  public QName getExtensionAttribute(QName name)
+  {
+  	return (QName) extAttrMap.get(name);
   }
 }
Index: src/com/ibm/wsdl/extensions/soap/SOAPFaultSerializer.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/extensions/soap/SOAPFaultSerializer.java,v
retrieving revision 1.3
diff -w -u -r1.3 SOAPFaultSerializer.java
--- src/com/ibm/wsdl/extensions/soap/SOAPFaultSerializer.java	30 Nov 2001 04:27:53 -0000	1.3
+++ src/com/ibm/wsdl/extensions/soap/SOAPFaultSerializer.java	18 Jun 2002 16:41:29 -0000
@@ -5,6 +5,8 @@
 import javax.wsdl.*;
 import javax.wsdl.extensions.*;
 import javax.wsdl.extensions.soap.*;
+import javax.wsdl.xml.*;
+import javax.wsdl.factory.*;
 import com.ibm.wsdl.*;
 import com.ibm.wsdl.util.*;
 import com.ibm.wsdl.util.xml.*;
@@ -67,10 +69,19 @@
   {
     SOAPFault soapFault = (SOAPFault)extReg.createExtension(parentType,
                                                             elementType);
-    QName message = DOMUtils.getQualifiedAttributeValue(el,
+    WSDLFactory factory = WSDLFactory.newInstance();
+    WSDLReader wsdlReader = factory.newWSDLReader();
+    QName message = wsdlReader.getFeature(Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES)
+      ? DOMUtils.getQualifiedAttributeValue(el,
+                                            Constants.ATTR_MESSAGE,
+                                            SOAPConstants.ELEM_HEADER,
+                                            def.getTargetNamespace(),
+                                            false)
+      : DOMUtils.getQualifiedAttributeValue(el,
                                                     Constants.ATTR_MESSAGE,
                                                     SOAPConstants.ELEM_HEADER,
                                                     false);
+                                                    
     String name = DOMUtils.getAttribute(el, Constants.ATTR_NAME);
     String use = DOMUtils.getAttribute(el, SOAPConstants.ATTR_USE);
     String encStyleStr = DOMUtils.getAttribute(el,
Index: src/com/ibm/wsdl/extensions/soap/SOAPHeaderSerializer.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/extensions/soap/SOAPHeaderSerializer.java,v
retrieving revision 1.3
diff -w -u -r1.3 SOAPHeaderSerializer.java
--- src/com/ibm/wsdl/extensions/soap/SOAPHeaderSerializer.java	30 Nov 2001 04:27:53 -0000	1.3
+++ src/com/ibm/wsdl/extensions/soap/SOAPHeaderSerializer.java	18 Jun 2002 16:41:29 -0000
@@ -6,6 +6,8 @@
 import javax.wsdl.*;
 import javax.wsdl.extensions.*;
 import javax.wsdl.extensions.soap.*;
+import javax.wsdl.xml.*;
+import javax.wsdl.factory.*;
 import com.ibm.wsdl.*;
 import com.ibm.wsdl.util.*;
 import com.ibm.wsdl.util.xml.*;
@@ -133,11 +135,19 @@
   {
     SOAPHeader soapHeader = (SOAPHeader)extReg.createExtension(parentType,
                                                                elementType);
-    QName message =
-      DOMUtils.getQualifiedAttributeValue(el,
+    WSDLFactory factory = WSDLFactory.newInstance();
+    WSDLReader wsdlReader = factory.newWSDLReader();
+    QName message = wsdlReader.getFeature(Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES)
+      ? DOMUtils.getQualifiedAttributeValue(el,
+                                            Constants.ATTR_MESSAGE,
+                                            SOAPConstants.ELEM_HEADER,
+                                            def.getTargetNamespace(),
+                                            false)
+      : DOMUtils.getQualifiedAttributeValue(el,
                                           Constants.ATTR_MESSAGE,
                                           SOAPConstants.ELEM_HEADER,
                                           false);
+
     String part = DOMUtils.getAttribute(el, SOAPConstants.ATTR_PART);
     String use = DOMUtils.getAttribute(el, SOAPConstants.ATTR_USE);
     String encStyleStr = DOMUtils.getAttribute(el,
Index: src/com/ibm/wsdl/util/StringUtils.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/util/StringUtils.java,v
retrieving revision 1.2
diff -w -u -r1.2 StringUtils.java
--- src/com/ibm/wsdl/util/StringUtils.java	5 Dec 2001 18:27:45 -0000	1.2
+++ src/com/ibm/wsdl/util/StringUtils.java	18 Jun 2002 16:41:29 -0000
@@ -362,17 +362,16 @@
 
       if (content instanceof InputStream)
       {
-        Reader in = null;
+        Reader in;
 
-        /*
-          Create an InputStreamReader appropriate to the codepage of the
-          URL content. If the content is from the local file system, the
-          encoding can be defaulted. Otherwise, assume an ISO Latin 1
-          encoding.
+        /* Create an InputStreamReader appropriate to the codepage of the URL content.
+           If the content is from the local file system, the encoding can be defaulted.
+           Otherwise, assume an ISO Latin 1 encoding.
         */
         if (url.getProtocol().equals("file"))
         {
           in = new InputStreamReader((InputStream)content);
+          if (!in.ready()) throw new FileNotFoundException();
         }
         else
         {
@@ -443,4 +442,34 @@
       return null;
     }
   }
+
+  public static boolean areURIsEquivalent(String uri1, String uri2)
+  {
+  	// If the object references are identical then they are the same object!
+  	// Also returns true if they're both null
+  	if (uri1 == uri2) return true;
+  	
+  	// If either one of them is now null, then they aren't the same!
+  	if (uri1 == null || uri2 == null) return false;
+
+	// If they are equal then they are of course equivalent
+  	if (uri1.equals(uri2)) return true;
+
+  	// Remove or add trailing / to uri2 as necessary
+  	String uri2Equiv = uri2;
+  	if (uri1.endsWith("/")) {
+  		if (!uri2.endsWith("/")) {
+  			uri2Equiv = uri2 + '/';
+  		}
+  	} else {
+  		// uri1 doesn't have trailing /
+  		if (uri2.endsWith("/")) {
+  			// but uri2 does so remove it
+  			uri2Equiv = uri2.substring(0, uri2.length()-1);
+  		}
+  	}
+  	// Now do the comparison
+  	if (!uri1.equals(uri2Equiv)) return false;
+  	return true;
+  }  
 }
Index: src/com/ibm/wsdl/util/xml/DOMUtils.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/util/xml/DOMUtils.java,v
retrieving revision 1.2
diff -w -u -r1.2 DOMUtils.java
--- src/com/ibm/wsdl/util/xml/DOMUtils.java	27 Nov 2001 05:51:57 -0000	1.2
+++ src/com/ibm/wsdl/util/xml/DOMUtils.java	18 Jun 2002 16:41:29 -0000
@@ -3,6 +3,8 @@
 import java.io.*;
 import org.w3c.dom.*;
 import javax.wsdl.*;
+import java.util.*;
+import com.ibm.wsdl.Constants;
 
 public class DOMUtils {
   /**
@@ -30,6 +32,39 @@
   }
 
   /**
+   * Returns the a HashMap of the attributes of an element.
+   * Element.getAttributes returns a NamedNodeMap
+   *
+   * @param el Element whose attributes are being looked for 
+   * @return the attributes
+   */
+  static public Map getAttributes (Element el) throws WSDLException {
+	HashMap attributes = new HashMap();
+	NamedNodeMap nodeMap = el.getAttributes();
+	int atts = nodeMap.getLength();
+	for (int a=0; a<atts; a++) {
+		Attr attribute = (Attr) nodeMap.item(a);
+		String aName = attribute.getName();
+		String lName = attribute.getLocalName();
+		String nSpace = attribute.getNamespaceURI();
+		QName name = new QName(nSpace,lName);
+		QName value = getQualifiedAttributeValue(
+	             	el,
+	                aName,
+	                Constants.ELEM_MESSAGE,
+	                false);
+		if (attributes.get(name) != null) {
+			throw new WSDLException(
+				WSDLException.INVALID_WSDL,
+				"Duplicate attribute name found in element "+el);
+		} else {
+			attributes.put(name, value);
+		}
+	}
+	return attributes;
+  }
+
+  /**
    * Returns the value of an attribute of an element. Returns null
    * if the attribute is not found (whereas Element.getAttributeNS
    * returns "" if an attrib is not found).
@@ -192,7 +227,7 @@
     {
       Element tempEl = (Element) tempNode;
       String namespaceURI = (prefix == null)
-                            ? getAttribute (tempEl, "xmlns")
+                            ? Constants.NS_URI_WSDL
                             : getAttributeNS (tempEl, NS_URI_XMLNS, prefix);
 
       if (namespaceURI != null)
@@ -262,6 +297,64 @@
       return null;
     }
   }
+  // special getQualifiedAttributeValue that uses a default namespace if the attribute prefix is null
+  public static QName getQualifiedAttributeValue(Element el,
+												 String attrName,
+												 String elDesc,
+												 String defaultNamespaceURI,
+												 boolean isRequired)
+												   throws WSDLException
+  {
+    String attrValue = DOMUtils.getAttribute(el, attrName);
+
+    if (attrValue != null)
+    {
+      int    index                 = attrValue.indexOf(':');
+      String attrValuePrefix       = (index != -1)
+                                     ? attrValue.substring(0, index)
+                                     : null;
+      String attrValueLocalPart    = attrValue.substring(index + 1);
+      String attrValueNamespaceURI = attrValuePrefix == null
+                                     ? defaultNamespaceURI
+                                     : DOMUtils.getNamespaceURIFromPrefix(el, attrValuePrefix);
+
+      if (attrValueNamespaceURI != null)
+      {
+        return new QName(attrValueNamespaceURI, attrValueLocalPart);
+      }
+      else
+      {
+        WSDLException wsdlExc = new WSDLException(WSDLException.INVALID_WSDL,
+                                                  "Unable to determine " +
+                                                  "namespace of '" +
+                                                  (attrValuePrefix != null
+                                                   ? attrValuePrefix + ":"
+                                                   : "") + attrValueLocalPart +
+                                                  "'.");
+
+        wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
+
+        throw wsdlExc;
+      }
+    }
+    else if (isRequired)
+    {
+      WSDLException wsdlExc = new WSDLException(WSDLException.INVALID_WSDL,
+                                                "The '" + attrName +
+                                                "' attribute must be " +
+                                                "specified for every " +
+                                                elDesc + " element.");
+
+      wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
+
+      throw wsdlExc;
+    }
+    else
+    {
+      return null;
+    }
+  }  
+  
 
   public static void throwWSDLException(Element location) throws WSDLException
   {
@@ -317,6 +410,27 @@
     if (value != null)
     {
       printAttribute(name,
+                     getQualifiedValue(value.getNamespaceURI(),
+                                       value.getLocalPart(),
+                                       def),
+                     pw);
+    }
+  }
+
+  /**
+   * Prints attributes with qualified names and values.
+   */
+  public static void printQualifiedAttribute(QName name,
+                                             QName value,
+                                             Definition def,
+                                             PrintWriter pw)
+                                               throws WSDLException
+  {
+    if (value != null)
+    {
+      printAttribute(getQualifiedValue(name.getNamespaceURI(),
+                                       name.getLocalPart(),
+                                       def),
                      getQualifiedValue(value.getNamespaceURI(),
                                        value.getLocalPart(),
                                        def),
Index: src/com/ibm/wsdl/xml/WSDLReaderImpl.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/xml/WSDLReaderImpl.java,v
retrieving revision 1.14
diff -w -u -r1.14 WSDLReaderImpl.java
--- src/com/ibm/wsdl/xml/WSDLReaderImpl.java	13 Feb 2002 06:15:08 -0000	1.14
+++ src/com/ibm/wsdl/xml/WSDLReaderImpl.java	18 Jun 2002 16:41:30 -0000
@@ -23,7 +23,7 @@
  * @author Matthew J. Duftler
  * @author Nirmal Mukhi
  */
-public class WSDLReaderImpl implements WSDLReader
+public class WSDLReaderImpl implements javax.wsdl.xml.WSDLReader
 {
   // Used for determining the style of operations.
   private static final List STYLE_ONE_WAY =
@@ -39,6 +39,8 @@
   private boolean importDocuments = true;
   private ExtensionRegistry extReg = null;
   private String factoryImplName = null;
+  private static boolean tolerateUnqualifiedQNames = true;
+  private ClassLoader classLoader;
 
   /**
    * Sets the specified feature to the specified value.
@@ -91,6 +93,10 @@
     {
       importDocuments = value;
     }
+    else if (name.equals(Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES))
+    {
+      tolerateUnqualifiedQNames = value;
+    }
     else
     {
       throw new IllegalArgumentException("Feature name '" + name +
@@ -120,6 +126,10 @@
     {
       return importDocuments;
     }
+    else if (name.equals(Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES))
+    {
+      return tolerateUnqualifiedQNames;
+    }
     else
     {
       throw new IllegalArgumentException("Feature name '" + name +
@@ -318,17 +328,84 @@
       {
         try
         {
+          Definition importedDef = null;
+          Reader reader = null;
+          URL url = null;
+          
+          // If a ClassLoader was used to load the base document, chances
+          // are we need to use it to find the import.
+          if (classLoader != null)
+          {
+          	if (locationURI.startsWith("/") || locationURI.startsWith("\\"))
+          	{
+          	  // Relative location has been specified from a root dir. However,
+          	  // using a ClassLoader, root dirs don't mean anything.
+              importedDef = (Definition) importedDefs.get(locationURI);
+              if (importedDef == null)
+              {
+              	locationURI = locationURI.substring(1,locationURI.length());
+              	InputStream in = classLoader.getResourceAsStream(locationURI);
+			    reader = new InputStreamReader(in);
+              }	          	  	
+          	}
+          	else if (locationURI.indexOf("://") != -1)
+          	{
+              // This is a fully specified URL of some kind so don't use the
+              // ClassLoader to find the import.
+              url = StringUtils.getURL(null, locationURI);
+          	  importedDef =	(Definition)importedDefs.get(url.toString());
+              if (importedDef == null)
+              {
+	            reader = StringUtils.getContentAsReader(url);	
+              }	
+          	}
+          	else
+          	{
+          	  // Import location has been specified relative to the base document
+          	  // and so we can to try to form the complete path to it. 
+
+          	  String base = def.getDocumentBaseURI();
+          	  if (base.startsWith("file:"))
+          	  {
+          		int i = base.lastIndexOf("/");
+          		if (i == -1) i = base.lastIndexOf("\\");
+          		if (i != -1)
+          		{
+          		  String path = base.substring(0,i+1);
+          		  url = new URL(null,path+locationURI);
+          	    }
+          	    else
+          	    {
+          	      url = new URL(null,"file:"+locationURI);
+          	    }          	    
+                
+                importedDef = (Definition) importedDefs.get(url.toString());
+                
+                if (importedDef == null)
+                {
+              	  InputStream in = classLoader.getResourceAsStream(url.getPath());
+			      reader = new InputStreamReader(in);	 	
+          	    }
+          	  }
+          	}
+          }
+          else
+          {
           String contextURI = def.getDocumentBaseURI();
           URL contextURL = (contextURI != null)
                            ? StringUtils.getURL(null, contextURI)
                            : null;
-          URL url = StringUtils.getURL(contextURL, locationURI);
-          Definition importedDef =
+          	url = StringUtils.getURL(contextURL, locationURI);
+          	importedDef =
             (Definition)importedDefs.get(url.toString());
+            if (importedDef == null)
+            {
+	          reader = StringUtils.getContentAsReader(url);	
+            }	
+          }
 
           if (importedDef == null)
           {
-            Reader reader = StringUtils.getContentAsReader(url);
             InputSource inputSource = new InputSource(reader);
             Document doc = getDocument(inputSource, locationURI);
             Element documentElement = doc.getDocumentElement();
@@ -344,14 +421,10 @@
             {
               if (verbose)
               {
-                System.out.println("Retrieving document at '" + locationURI +
-                                   "'" +
-                                   (contextURI == null
-                                    ? "."
-                                    : ", relative to '" + contextURI + "'."));
+                System.out.println("Retrieving import document at '" + locationURI);
               }
-
-              importedDef = readWSDL(url.toString(),
+              String urlString = (url == null) ? locationURI : url.toString();				
+			  importedDef = readWSDL(urlString,
                                      documentElement,
                                      importedDefs);
             }
@@ -426,7 +499,15 @@
     Binding binding = null;
     String name = DOMUtils.getAttribute(bindingEl, Constants.ATTR_NAME);
     QName portTypeName =
-      DOMUtils.getQualifiedAttributeValue(bindingEl,
+      tolerateUnqualifiedQNames
+        ? DOMUtils.getQualifiedAttributeValue(
+          bindingEl,
+          Constants.ATTR_TYPE,
+          Constants.ELEM_BINDING,
+          def.getTargetNamespace(),
+          false)
+        : DOMUtils.getQualifiedAttributeValue(
+          bindingEl,
                                           Constants.ATTR_TYPE,
                                           Constants.ELEM_BINDING,
                                           false);
@@ -710,16 +791,35 @@
   {
     Part part = def.createPart();
     String name = DOMUtils.getAttribute(partEl, Constants.ATTR_NAME);
-    QName elementName =
-      DOMUtils.getQualifiedAttributeValue(partEl,
+    QName elementName;
+    QName typeName;
+    if (tolerateUnqualifiedQNames) 
+    {
+        elementName = DOMUtils.getQualifiedAttributeValue(
+            partEl,
                                           Constants.ATTR_ELEMENT,
                                           Constants.ELEM_MESSAGE,
+            def.getTargetNamespace(),
                                           false);
-    QName typeName =
-      DOMUtils.getQualifiedAttributeValue(partEl,
+        typeName = DOMUtils.getQualifiedAttributeValue(
+            partEl,
                                           Constants.ATTR_TYPE,
                                           Constants.ELEM_MESSAGE,
+            def.getTargetNamespace(),
+            false);
+    } else 
+    {
+        elementName = DOMUtils.getQualifiedAttributeValue(
+            partEl,
+            Constants.ATTR_ELEMENT,
+            Constants.ELEM_MESSAGE,
                                           false);
+        typeName = DOMUtils.getQualifiedAttributeValue(
+            partEl,
+            Constants.ATTR_TYPE,
+            Constants.ELEM_MESSAGE,
+            false);
+    }
 
     if (name != null)
     {
@@ -752,6 +852,48 @@
       tempEl = DOMUtils.getNextSiblingElement(tempEl);
     }
 
+	// Populate the attributes for the Part object
+	Map attributes = DOMUtils.getAttributes(partEl);
+	Set attributeNames = attributes.keySet();
+	Iterator attrIterator = attributeNames.iterator();
+	while (attrIterator.hasNext())
+	{
+      QName attrValue = null;
+      QName attrName = (QName) attrIterator.next();
+      String lName = attrName.getLocalPart();
+      String nSpace = attrName.getNamespaceURI();
+      if (lName != null)
+      {
+        if ((nSpace.equals(Constants.NS_URI_WSDL) || nSpace.equals(""))
+          && (lName.equals(Constants.ATTR_NAME)
+            || lName.equals(Constants.ATTR_ELEMENT)
+            || lName.equals(Constants.ATTR_TYPE)))
+                continue;
+
+        attrValue = (QName) attributes.get(attrName);
+
+        if (attrValue != null)
+        {
+          // WSDL spec states that attribute namespace must differ from the
+          // WSDL namespace for custom message-typing attributes   
+          if (attrName.getNamespaceURI().equals(Constants.NS_URI_WSDL)
+            || attrName.getNamespaceURI().equals(""))
+          {
+            throw new WSDLException(
+              WSDLException.INVALID_WSDL,
+              "Error in "
+                + part
+                + ". "
+                + "Namespace for attribute '"
+                + attrName
+                + "' cannot be WSDL namespace.");
+          }
+
+          part.setExtensionAttribute(attrName, attrValue);
+        }
+      }
+	}
+	
     // Need to do something here to locate part definition.
 
     return part;
@@ -803,6 +945,42 @@
       tempEl = DOMUtils.getNextSiblingElement(tempEl);
     }
 
+	// Before we return the port type, check for duplicate operation input
+	// or output names. The WSDL spec states:
+	// "The name attribute of the input and output elements provides a unique
+	// name among all input and output elements within the enclosing port type."
+	List ops = portType.getOperations();
+	ArrayList inNames = new ArrayList(ops.size());
+	ArrayList outNames = new ArrayList(ops.size());
+	Iterator opsIt = ops.iterator();
+	while (opsIt.hasNext())
+	{
+		Operation op = (Operation) opsIt.next();
+		String in = (op.getInput() == null) ? null : op.getInput().getName();
+		if(in != null && !inNames.contains(in))
+		{
+			inNames.add(in);
+		}
+		else if (in != null)
+		{
+			throw new WSDLException(WSDLException.INVALID_WSDL,
+				"Duplicate input name '" + in + "' in portType '"
+				+ portType.getQName() + "'");
+		}
+		
+		String out = (op.getOutput() == null) ? null : op.getOutput().getName();
+		if(out != null && !outNames.contains(out))
+		{
+			outNames.add(out);
+		}
+		else if (out != null)
+		{
+			throw new WSDLException(WSDLException.INVALID_WSDL,
+				"Duplicate output name '" + out + "' in portType '"
+				+ portType.getQName() + "'");
+		}
+	}
+
     return portType;
   }
 
@@ -968,8 +1146,15 @@
   {
     Port port = def.createPort();
     String name = DOMUtils.getAttribute(portEl, Constants.ATTR_NAME);
-    QName bindingStr = 
-      DOMUtils.getQualifiedAttributeValue(portEl,
+    QName bindingStr = tolerateUnqualifiedQNames
+	      ? DOMUtils.getQualifiedAttributeValue(
+	      		portEl,
+	            Constants.ATTR_BINDING,
+	            Constants.ELEM_PORT,
+	            def.getTargetNamespace(),
+	         false)
+	      : DOMUtils.getQualifiedAttributeValue(
+	      		portEl,
                                           Constants.ATTR_BINDING,
                                           Constants.ELEM_PORT,
                                           false);
@@ -1338,6 +1523,25 @@
   }
 
   /**
+   * Read the specified WSDL document into a WSDL definition.
+   *
+   * @param documentBaseURI the document base URI of the WSDL definition
+   * described by the document. Will be set as the documentBaseURI
+   * of the returned Definition. Can be null, in which case it
+   * will be ignored.
+   * @param wsdlDocument the WSDL document, an XML 
+   * document obeying the WSDL schema.
+   * @param cl a ClassLoader used to locate resources
+   * @return the definition described in the document.
+   */
+  public Definition readWSDL(String documentBaseURI, Document wsdlDocument, ClassLoader cl)
+    throws WSDLException
+  {
+  	classLoader = cl;
+    return readWSDL(documentBaseURI, wsdlDocument.getDocumentElement());
+  }  
+
+  /**
    * Read a WSDL document into a WSDL definition.
    *
    * @param documentBaseURI the document base URI of the WSDL definition
@@ -1355,4 +1559,94 @@
     return readWSDL(documentBaseURI,
                     getDocument(inputSource, "- WSDL Document -"));
   }
+  
+  /**
+   * Read a WSDL document into a WSDL definition.
+   *
+   * @param documentBaseURI the document base URI of the WSDL definition
+   * described by the document. Will be set as the documentBaseURI
+   * of the returned Definition. Can be null, in which case it
+   * will be ignored.
+   * @param inputSource an InputSource pointing to the
+   * WSDL document, an XML document obeying the WSDL schema.
+   * @param cl a ClassLoader used to locate resources
+   * @return the definition described in the document pointed to
+   * by the InputSource.
+   */
+  public Definition readWSDL(String documentBaseURI, InputSource inputSource, ClassLoader cl)
+    throws WSDLException
+  {
+  	classLoader = cl;
+    return readWSDL(documentBaseURI,
+                    getDocument(inputSource, "- WSDL Document -"));
+  }  
+  
+  /**
+   * Read the WSDL document accessible via the specified
+   * URI into a WSDL definition.
+   *
+   * @param contextURL the context in which to resolve the
+   * wsdlURI, if the wsdlURI is relative. Can be null, in which
+   * case it will be ignored.
+   * @param wsdlURI a URI (can be a filename or URL) pointing to a
+   * WSDL XML definition.
+   * @param cl a java.lang.ClassLoader used to attempt to load imported WSDL files
+   * using its classpath.  If unsuccessful, the conventional way to load imported
+   * WSDL files is used.
+   * @return the definition.
+   */
+  public Definition readWSDL(String contextURI, String wsdlURI, ClassLoader cl)
+      throws WSDLException {
+      try {
+          if (verbose) {
+              System.out.println(
+                  "Retrieving document at '"
+                      + wsdlURI
+                      + "'"
+                      + (contextURI == null ? "." : ", relative to '" + contextURI + "'."));
+          }
+          
+          Reader reader = null;
+          URL url = null;
+          URL contextURL = (contextURI != null)
+                     ? StringUtils.getURL(null, contextURI)
+                     : null;
+          if (cl != null)  {
+          	classLoader = cl;
+          	InputStream in = null;
+			try {			
+				if (contextURL!=null)		
+					url = new URL(contextURL, wsdlURI);
+				else{
+					if(wsdlURI.indexOf(":") == -1)
+						url = new URL("file", null, wsdlURI);
+					else
+						url = new URL(wsdlURI);
+				}
+				String wsdlRelativeLocation = url.getPath();
+				if (wsdlRelativeLocation.startsWith("/"))
+					wsdlRelativeLocation=wsdlRelativeLocation.substring(1);
+				in = cl.getResourceAsStream(wsdlRelativeLocation);
+				reader = new InputStreamReader(in);
+			} catch (Exception exc) {
+			}
+          }		
+          if (reader == null) {
+		  url = StringUtils.getURL(contextURL, wsdlURI);
+		  reader = StringUtils.getContentAsReader(url);
+		}
+        InputSource inputSource = new InputSource(reader);
+        Document doc = getDocument(inputSource, wsdlURI);
+        Definition def = readWSDL(url.toString(), doc);
+
+        return def;
+        } catch (WSDLException e) {
+            throw e;
+        } catch (Throwable t) {
+            throw new WSDLException(
+                WSDLException.OTHER_ERROR,
+                "Unable to resolve imported document at '" + wsdlURI + "'.",
+                t);
+        }
+    }
 }
Index: src/com/ibm/wsdl/xml/WSDLWriterImpl.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/com/ibm/wsdl/xml/WSDLWriterImpl.java,v
retrieving revision 1.9
diff -w -u -r1.9 WSDLWriterImpl.java
--- src/com/ibm/wsdl/xml/WSDLWriterImpl.java	27 Mar 2002 17:30:41 -0000	1.9
+++ src/com/ibm/wsdl/xml/WSDLWriterImpl.java	18 Jun 2002 16:41:30 -0000
@@ -708,6 +708,18 @@
                                          def,
                                          pw);
 
+		Iterator extAtts = part.getExtensionAttributeNames();
+		
+		while(extAtts.hasNext())
+		{
+			QName aName = (QName) extAtts.next();
+			QName aValue = (QName) part.getExtensionAttribute(aName);
+			DOMUtils.printQualifiedAttribute(aName,
+                                         	aValue,
+                                         	def,
+                                         	pw);
+		}
+
         Element docEl = part.getDocumentationElement();
 
         if (docEl == null)
@@ -932,18 +944,7 @@
   public void writeWSDL(Definition wsdlDef, OutputStream sink)
     throws WSDLException
   {
-    Writer writer = null;
-
-    try
-    {
-      writer = new OutputStreamWriter(sink, "UTF8");
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      e.printStackTrace();
-
-      writer = new OutputStreamWriter(sink);
-    }
+    Writer writer = new OutputStreamWriter(sink);
 
     writeWSDL(wsdlDef, writer);
   }
Index: src/javax/wsdl/Part.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/javax/wsdl/Part.java,v
retrieving revision 1.1.1.1
diff -w -u -r1.1.1.1 Part.java
--- src/javax/wsdl/Part.java	20 Jun 2001 14:03:41 -0000	1.1.1.1
+++ src/javax/wsdl/Part.java	18 Jun 2002 16:41:30 -0000
@@ -1,6 +1,7 @@
 package javax.wsdl;
 
 import org.w3c.dom.*;
+import java.util.Iterator;
 
 /**
  * This interface represents a message part and contains the part's
@@ -51,4 +52,11 @@
    * @return the documentation element
    */
   public Element getDocumentationElement();
+    
+  public void setExtensionAttribute(QName name, QName value)
+  throws WSDLException;
+  
+  public Iterator getExtensionAttributeNames();
+  
+  public QName getExtensionAttribute(QName name);
 }
Index: src/javax/wsdl/QName.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/javax/wsdl/QName.java,v
retrieving revision 1.1.1.1
diff -w -u -r1.1.1.1 QName.java
--- src/javax/wsdl/QName.java	20 Jun 2001 14:03:41 -0000	1.1.1.1
+++ src/javax/wsdl/QName.java	18 Jun 2002 16:41:30 -0000
@@ -16,6 +16,7 @@
 {
   private String namespaceURI = null;
   private String localPart = null;
+  private int hashcode;
 
   public QName()
   {
@@ -27,25 +28,31 @@
   {
     if (node != null)
     {
-      setNamespaceURI(node.getNamespaceURI());
-      setLocalPart(node.getLocalName());
+      setNamespaceURI(node.getNamespaceURI(), false);
+      setLocalPart(node.getLocalName(), true);
     }
     else
     {
-      setNamespaceURI(null);
-      setLocalPart(null);
+      setNamespaceURI(null, false);
+      setLocalPart(null, true);
     }
   }
 
   public QName(String namespaceURI, String localPart)
   {
-    setNamespaceURI(namespaceURI);
-    setLocalPart(localPart);
+    setNamespaceURI(namespaceURI, false);
+    setLocalPart(localPart, true);
   }
 
   public void setNamespaceURI(String namespaceURI)
   {
+  	this.setNamespaceURI(namespaceURI, true);
+  }
+
+  private void setNamespaceURI(String namespaceURI, boolean calc)
+  {
     this.namespaceURI = (namespaceURI == null ? "" : namespaceURI).intern();
+    if (calc) calculateHashcode();
   }
 
   public String getNamespaceURI()
@@ -55,7 +62,13 @@
 
   public void setLocalPart(String localPart)
   {
+  	setLocalPart(localPart, true);
+  }
+
+  private void setLocalPart(String localPart, boolean calc)
+  {
     this.localPart = (localPart == null ? "" : localPart).intern();
+    if (calc) calculateHashcode();
   }
 
   public String getLocalPart()
@@ -65,18 +78,53 @@
 
   public int hashCode()
   {
-    String hash1 = namespaceURI.hashCode() + "";
+  	return hashcode;
+  }
+  	
+  private void calculateHashcode() {
+    String ns = namespaceURI;
+  	// Tolerate missing '/' at end of namespace
+  	if(!ns.endsWith("/")) ns = ns+"/";
+    String hash1 = ns.hashCode() + "";
     String hash2 = localPart.hashCode() + "";
     String hash3 = hash1 + '_' + hash2;
 
-    return hash3.hashCode();
+    hashcode = hash3.hashCode();
   }
 
   public boolean equals(Object obj)
   {
-    return (obj != null
-            && namespaceURI == ((QName)obj).getNamespaceURI()
-            && localPart == ((QName)obj).getLocalPart());
+  	if (obj == null) return false;
+  	if (obj == this) return true;
+
+	// Is obj the same class?
+	// Don't use instanceof as other class could be different subclass
+  	if (obj.getClass() != getClass()) return false;
+  	
+  	QName qnObj = (QName)obj;
+  	
+  	// Get equivalent namespace string from obj
+  	// ie add or remove trailing slash as necessary
+  	String equivNS = qnObj.getNamespaceURI();
+
+    if (namespaceURI.endsWith("/")) {
+    	if (!equivNS.endsWith("/")) {
+    		equivNS = equivNS + '/';
+    	}
+    } else {
+    	// this.namespaceURI doesn't end in /
+    	if (equivNS.endsWith("/")) {
+    		// but the obj one does so remove it from equivNS
+    		equivNS = equivNS.substring(0, equivNS.length()-1);
+    	}
+    }
+    
+    // Now do the comparison
+  	if (!namespaceURI.equals(equivNS)) return false;
+  	
+  	if (!localPart.equals(qnObj.getLocalPart())) return false;
+  	
+  	return true;
   }
 
   public boolean matches(Node node)
@@ -89,8 +137,8 @@
   {
     in.defaultReadObject();
 
-    setNamespaceURI(namespaceURI);
-    setLocalPart(localPart);
+    setNamespaceURI(namespaceURI, false);
+    setLocalPart(localPart, true);
   }
 
   public Object clone() throws CloneNotSupportedException
Index: src/javax/wsdl/xml/WSDLReader.java
===================================================================
RCS file: /usr/cvs/wsdl4j/wsdl4j/src/javax/wsdl/xml/WSDLReader.java,v
retrieving revision 1.8
diff -w -u -r1.8 WSDLReader.java
--- src/javax/wsdl/xml/WSDLReader.java	25 Jan 2002 04:25:48 -0000	1.8
+++ src/javax/wsdl/xml/WSDLReader.java	18 Jun 2002 16:41:30 -0000
@@ -159,6 +159,21 @@
     throws WSDLException;
 
   /**
+   * Read the specified WSDL document into a WSDL definition.
+   *
+   * @param documentBaseURI the document base URI of the WSDL definition
+   * described by the document. Will be set as the documentBaseURI
+   * of the returned Definition. Can be null, in which case it
+   * will be ignored.
+   * @param wsdlDocument the WSDL document, an XML 
+   * document obeying the WSDL schema.
+   * @param cl a ClassLoader used to locate resources
+   * @return the definition described in the document.
+   */
+  public Definition readWSDL(String documentBaseURI, Document wsdlDocument, ClassLoader cl)
+    throws WSDLException;    
+
+  /**
    * Read a WSDL document into a WSDL definition.
    *
    * @param documentBaseURI the document base URI of the WSDL definition
@@ -172,4 +187,37 @@
    */
   public Definition readWSDL(String documentBaseURI, InputSource inputSource)
     throws WSDLException;
+    
+  /**
+   * Read a WSDL document into a WSDL definition.
+   *
+   * @param documentBaseURI the document base URI of the WSDL definition
+   * described by the document. Will be set as the documentBaseURI
+   * of the returned Definition. Can be null, in which case it
+   * will be ignored.
+   * @param inputSource an InputSource pointing to the
+   * WSDL document, an XML document obeying the WSDL schema.
+   * @param cl a ClassLoader used to locate resources
+   * @return the definition described in the document pointed to
+   * by the InputSource.
+   */
+  public Definition readWSDL(String documentBaseURI, InputSource inputSource, ClassLoader cl)
+    throws WSDLException;
+    
+  /**
+   * Read the WSDL document accessible via the specified
+   * URI into a WSDL definition.
+   *
+   * @param contextURL the context in which to resolve the
+   * wsdlURI, if the wsdlURI is relative. Can be null, in which
+   * case it will be ignored.
+   * @param wsdlURI a URI (can be a filename or URL) pointing to a
+   * WSDL XML definition.
+   * @param cl a java.lang.ClassLoader used to attempt to load imported WSDL files
+   * using its classpath.  If unsuccessful, the conventional way to load imported
+   * WSDL files is used.
+   * @return the definition.
+   */
+  public Definition readWSDL(String contextURI, String wsdlURI, ClassLoader cl)
+      throws WSDLException;  
 }