Attachment #119684 for bug #252258

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.xml.sax.InputSource;

import com.ibm.wsdl.Constants;
import com.ibm.wsdl.extensions.schema.SchemaConstants;
import com.ibm.wsdl.util.StringUtils;
import com.ibm.wsdl.util.xml.DOMUtils;
import com.ibm.wsdl.util.xml.QNameUtils;

            else
            {
              QName qname = QNameUtils.newQName(element2);
              if (SchemaConstants.XSD_QNAME_LIST.contains(qname))
              {
                WSDLFactory wsdlfactory =
                  factoryImplName == null

          partEl,
          Constants.ATTR_ELEMENT,
          Constants.ELEM_MESSAGE,
          false,
          def);
    }

    catch (WSDLException we)

        partEl,
        Constants.ATTR_TYPE,
        Constants.ELEM_MESSAGE,
        false,
        def);

    if (name != null)
    {

      tempEl = DOMUtils.getNextSiblingElement(tempEl);
    }

    parseExtensibilityAttributes(partEl, Part.class, part, def);
//    Map extensionAttributes = part.getExtensionAttributes();
//    extensionAttributes.putAll(getPartAttributes(partEl, def));

    // Need to do something here to locate part definition.



    return bindingOperation;
  }
  
 protected ExtensibilityElement parseSchema(Class ccc, Element elem, Definition def) throws WSDLException
{
   ExtensibilityElement extElem = null;
   extElem = super.parseSchema(ccc, elem, def);

   // Try to add element to list
   addElementToList(elem, extElem);
  return extElem;
 }
}




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.extensions.schema.Schema;

import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;

import com.ibm.wsdl.Constants;
import com.ibm.wsdl.extensions.schema.SchemaConstants;

/**
 * Plugin validator for the WSDL Validation framework. Validates inline schema found in a WSDL document.

  public Map validate(Object element, List parents, String filename) throws Exception
  {
  	elements = new Vector();
  	Schema elem = (Schema) element;
    Definition wsdlDefinition = (Definition) parents.get(parents.size() - 1);
    // Add in the namespaces defined in the doc already that aren't defined locally in this schema.
    // There is no need to check for namespaces other then in the defintions and types elements as


    // If the namespace given is one of the old schema namespaces produce a warning.
    String namespace = w3celement.getNamespaceURI();
    if(namespace.equals(SchemaConstants.NS_URI_XSD_1999) || namespace.equals(SchemaConstants.NS_URI_XSD_2000))
    {
      throw new Exception("An old version of the schema namespace is specified.");
    }

      Iterator iSchemas = schemas.iterator();
      while (iSchemas.hasNext())
      {
    	Schema extElem = (Schema) iSchemas.next();
        String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
        if (thisNamespace != null && !thisNamespace.equalsIgnoreCase(targetNamespace))
        {




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import com.ibm.wsdl.extensions.schema.SchemaConstants;

/**
 * Generate a String representation of a schema for an inline schema. Will add imports for unresolved

  protected final String TYPE = "type";
  protected final String NAME = "name";
  protected final String[] ignoreNamespaces =
    { SchemaConstants.NS_URI_XSD_1999, SchemaConstants.NS_URI_XSD_2000, SchemaConstants.NS_URI_XSD_2001 };

  protected static InlineSchemaGenerator instance = null;


          }
        }
        // Replace old schema namespaces with the new schema namespace.
        if(nodeValue.equals(SchemaConstants.NS_URI_XSD_1999) || nodeValue.equals(SchemaConstants.NS_URI_XSD_2000))
         {
          nodeValue = SchemaConstants.NS_URI_XSD_2001;
        }
        xsdString.append(nodeValue).append("\"");
      }

      {
        String key = (String)keys.nextElement();
        String declNS = (String)reqNSDecl.get(key);
        if(declNS.equals(SchemaConstants.NS_URI_XSD_1999) || declNS.equals(SchemaConstants.NS_URI_XSD_2000))
         {
          declNS = SchemaConstants.NS_URI_XSD_2001;
        }
        xsdString.append(" ").append(key).append("=\"").append(declNS).append("\"");
      }

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %_PLUGIN_NAME	3	Bundle-Name: %_PLUGIN_NAME
4	Bundle-SymbolicName: org.eclipse.wst.wsi; singleton:=true	4	Bundle-SymbolicName: org.eclipse.wst.wsi; singleton:=true
5	Bundle-Version: 1.0.205.qualifier	5	Bundle-Version: 1.0.305.qualifier
6	Bundle-Activator: org.eclipse.wst.wsi.internal.WSITestToolsPlugin	6	Bundle-Activator: org.eclipse.wst.wsi.internal.WSITestToolsPlugin
7	Bundle-Vendor: %_PROVIDER_NAME	7	Bundle-Vendor: %_PROVIDER_NAME
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin
Lines 49-55 Link Here
49	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",	49	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
50	org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",	50	org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
51	org.eclipse.wst.ws;bundle-version="[1.0.100,2.0.0)",	51	org.eclipse.wst.ws;bundle-version="[1.0.100,2.0.0)",
52	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	52	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
53	org.uddi4j;bundle-version="[2.0.4,2.1.0)",	53	org.uddi4j;bundle-version="[2.0.4,2.1.0)",
54	org.apache.axis;bundle-version="[1.3.0,2.0.0)",	54	org.apache.axis;bundle-version="[1.3.0,2.0.0)",
55	com.ibm.icu;bundle-version="[3.4.4,4.0.0)",	55	com.ibm.icu;bundle-version="[3.4.4,4.0.0)",




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import javax.wsdl.Service;
import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPFault;

        extElement = (ExtensibilityElement) iterator.next();
        // If this is an unknown ext. element, then see if it is a schema element
        TargetNamespaceProcessor tnsProcessor = null;
        if (extElement instanceof Schema)
        {
          tnsProcessor = new TargetNamespaceProcessor(definition.getDocumentBaseURI());


          if ((nextList =
            tnsProcessor.processAllSchema(
              ((Schema) extElement).getElement()))
            != null)
            if (list == null)
              list = new Vector();




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *******************************************************************************/
package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;

import javax.wsdl.Message;
import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;

import org.eclipse.wst.wsi.internal.core.WSIException;
import org.eclipse.wst.wsi.internal.core.WSITag;

    */
   public void visit(ExtensibilityElement obj, Object parent, WSDLTraversalContext ctx)
   {
     if((obj != null) && (obj instanceof Schema))
     {
    	 Schema el = (Schema) obj;
       try {
         processor.processAllSchema(el.getElement());
       } catch (WSIException e) {}




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.extensions.schema.Schema;

import org.eclipse.wst.wsi.internal.core.WSIConstants;
import org.eclipse.wst.wsi.internal.core.WSIException;

      for (int i = 0; i < extElems.size(); i++)
      {
        // Getting wsdl:schema element
        Schema schema =
          (Schema) extElems.get(i);
        // Getting a value of the attribute xmlns:xml
        String attrValue = schema.getElement().getAttributeNS(
          WSIConstants.NS_URI_XMLNS, "xml");

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002-2005 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 14-20 Link Here
14		14
15	import javax.wsdl.Types;	15	import javax.wsdl.Types;
16	import javax.wsdl.extensions.ExtensibilityElement;	16	import javax.wsdl.extensions.ExtensibilityElement;
17	import javax.wsdl.extensions.UnknownExtensibilityElement;	17	import javax.wsdl.extensions.schema.Schema;
18		18
19	import org.eclipse.wst.wsi.internal.core.WSIException;	19	import org.eclipse.wst.wsi.internal.core.WSIException;
20	import org.eclipse.wst.wsi.internal.core.WSITag;	20	import org.eclipse.wst.wsi.internal.core.WSITag;
Lines 67-73 Link Here
67	{	67	{
68	// If it is an unknown ext. element and it is a schema, then check it	68	// If it is an unknown ext. element and it is a schema, then check it
69	if ((extElement = (ExtensibilityElement) extElements.get(i))	69	if ((extElement = (ExtensibilityElement) extElements.get(i))
70	instanceof UnknownExtensibilityElement)	70	instanceof Schema)
71	{	71	{
72	if (!extElement.getElementType().equals(WSITag.ELEM_XSD_SCHEMA))	72	if (!extElement.getElementType().equals(WSITag.ELEM_XSD_SCHEMA))
73	{	73	{




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;

import org.eclipse.wst.wsi.internal.core.WSIException;
import org.eclipse.wst.wsi.internal.core.WSITag;

      while (it.hasNext())
      {
        ExtensibilityElement el = (ExtensibilityElement) it.next();
        if (el instanceof Schema)
          searchForSchema(((Schema) el).getElement(),
              definition.getDocumentBaseURI(), new ArrayList());
      }
    }




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;

import org.eclipse.wst.wsi.internal.core.WSIException;
import org.eclipse.wst.wsi.internal.core.WSITag;

      while (it.hasNext())
      {
        ExtensibilityElement el = (ExtensibilityElement) it.next();
        if (el instanceof Schema
          && el.getElementType().equals(ELEM_XSD_SCHEMA))
          searchForSchema(((Schema) el).getElement(),
              definition.getDocumentBaseURI(), new ArrayList());
      }
    }




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import javax.wsdl.Definition;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;
import javax.xml.namespace.QName;

import org.eclipse.wst.wsi.internal.core.WSIException;

    Object parent,
    WSDLTraversalContext ctx)
  {
    if (el instanceof Schema)
      searchForImport(((Schema) el).getElement());
  }

  /* Validates the test assertion.




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;

import org.eclipse.wst.wsi.internal.core.WSIException;
import org.eclipse.wst.wsi.internal.core.WSITag;

      while (it.hasNext())
      {
        ExtensibilityElement el = (ExtensibilityElement) it.next();
        if (el instanceof Schema)
          searchForSchema(((Schema) el).getElement());
      }
    }





/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;

import org.eclipse.wst.wsi.internal.core.WSIException;
import org.eclipse.wst.wsi.internal.core.WSITag;

        while (it.hasNext())
        {
          ExtensibilityElement el = (ExtensibilityElement) it.next();
          if (el instanceof Schema
            && el.getElementType().equals(ELEM_XSD_SCHEMA))
            testNode(((Schema) el).getElement(),
              definition.getDocumentBaseURI(), new ArrayList());

          if (result.equals(AssertionResult.RESULT_FAILED))




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation, Parasoft and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.ibm.icu.util.StringTokenizer;
import java.util.Vector;

import javax.wsdl.Binding;

import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;

import com.ibm.icu.util.StringTokenizer;
import com.ibm.wsdl.Constants;
import com.ibm.wsdl.util.xml.DOM2Writer;
import com.ibm.wsdl.util.xml.DOMUtils;

                {
                  if (attr != null)
                    xsiType =
                      DOMUtils.getQName(attr.getNodeValue(), (Element) m, wsdlDocument.getDefinitions());
                }
                catch (javax.wsdl.WSDLException we)
                {

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002-2005 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 20-26 Link Here
20	import javax.wsdl.Part;	20	import javax.wsdl.Part;
21	import javax.wsdl.Types;	21	import javax.wsdl.Types;
22	import javax.wsdl.extensions.ExtensibilityElement;	22	import javax.wsdl.extensions.ExtensibilityElement;
23	import javax.wsdl.extensions.UnknownExtensibilityElement;	23	import javax.wsdl.extensions.schema.Schema;
24	import javax.xml.namespace.QName;	24	import javax.xml.namespace.QName;
25		25
26	import org.eclipse.wst.wsi.internal.core.WSIConstants;	26	import org.eclipse.wst.wsi.internal.core.WSIConstants;
Lines 274-280 Link Here
274	.equals(new QName(WSIConstants.NS_URI_XSD, "schema")))	274	.equals(new QName(WSIConstants.NS_URI_XSD, "schema")))
275	{	275	{
276	typesElement =	276	typesElement =
277	((UnknownExtensibilityElement) extElem).getElement();	277	((Schema) extElem).getElement();
278	break;	278	break;
279	}	279	}
280	}	280	}

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002-2005 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 576-582 Link Here
576	id.equals("BP2123") \|\|	576	id.equals("BP2123") \|\|
577	id.equals("SSBP2209") \|\|	577	id.equals("SSBP2209") \|\|
578	id.equals("AP2209") \|\|	578	id.equals("AP2209") \|\|
579	id.equals("BP2700")	579	id.equals("BP2700") \|\|
		580	id.equals("BP2011")
580	);	581	);
581	}	582	}
582	return result;	583	return result;




/*******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import javax.wsdl.Service;
import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPFault;

      while (it.hasNext())
      {
        ExtensibilityElement el = (ExtensibilityElement) it.next();
        if (el instanceof Schema)
          searchForSchema(
            ((Schema) el).getElement(),
            context);
      }
    }

Return to bug 252258

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java (-7 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002-2005 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 47-52 Link Here
47	import org.xml.sax.InputSource;	47	import org.xml.sax.InputSource;
48		48
49	import com.ibm.wsdl.Constants;	49	import com.ibm.wsdl.Constants;
		50	import com.ibm.wsdl.extensions.schema.SchemaConstants;
50	import com.ibm.wsdl.util.StringUtils;	51	import com.ibm.wsdl.util.StringUtils;
51	import com.ibm.wsdl.util.xml.DOMUtils;	52	import com.ibm.wsdl.util.xml.DOMUtils;
52	import com.ibm.wsdl.util.xml.QNameUtils;	53	import com.ibm.wsdl.util.xml.QNameUtils;
Lines 234-240 Link Here
234	else	235	else
235	{	236	{
236	QName qname = QNameUtils.newQName(element2);	237	QName qname = QNameUtils.newQName(element2);
237	if (Constants.XSD_QNAME_LIST.contains(qname))	238	if (SchemaConstants.XSD_QNAME_LIST.contains(qname))
238	{	239	{
239	WSDLFactory wsdlfactory =	240	WSDLFactory wsdlfactory =
240	factoryImplName == null	241	factoryImplName == null
Lines 445-451 Link Here
445	partEl,	446	partEl,
446	Constants.ATTR_ELEMENT,	447	Constants.ATTR_ELEMENT,
447	Constants.ELEM_MESSAGE,	448	Constants.ELEM_MESSAGE,
448	false);	449	false,
		450	def);
449	}	451	}
450		452
451	catch (WSDLException we)	453	catch (WSDLException we)
Lines 463-469 Link Here
463	partEl,	465	partEl,
464	Constants.ATTR_TYPE,	466	Constants.ATTR_TYPE,
465	Constants.ELEM_MESSAGE,	467	Constants.ELEM_MESSAGE,
466	false);	468	false,
		469	def);
467		470
468	if (name != null)	471	if (name != null)
469	{	472	{
Lines 496-504 Link Here
496	tempEl = DOMUtils.getNextSiblingElement(tempEl);	499	tempEl = DOMUtils.getNextSiblingElement(tempEl);
497	}	500	}
498		501
499	Map extensionAttributes = part.getExtensionAttributes();	502	parseExtensibilityAttributes(partEl, Part.class, part, def);
500		503	// Map extensionAttributes = part.getExtensionAttributes();
501	extensionAttributes.putAll(getPartAttributes(partEl, def));	504	// extensionAttributes.putAll(getPartAttributes(partEl, def));
502		505
503	// Need to do something here to locate part definition.	506	// Need to do something here to locate part definition.
504		507
Lines 797-801 Link Here
797		800
798	return bindingOperation;	801	return bindingOperation;
799	}	802	}
		803
		804	protected ExtensibilityElement parseSchema(Class ccc, Element elem, Definition def) throws WSDLException
		805	{
		806	ExtensibilityElement extElem = null;
		807	extElem = super.parseSchema(ccc, elem, def);
800		808
		809	// Try to add element to list
		810	addElementToList(elem, extElem);
		811	return extElem;
		812	}
801	}	813	}

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java (-4 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002-2005 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 36-42 Link Here
36	import javax.wsdl.Service;	36	import javax.wsdl.Service;
37	import javax.wsdl.Types;	37	import javax.wsdl.Types;
38	import javax.wsdl.extensions.ExtensibilityElement;	38	import javax.wsdl.extensions.ExtensibilityElement;
39	import javax.wsdl.extensions.UnknownExtensibilityElement;	39	import javax.wsdl.extensions.schema.Schema;
40	import javax.wsdl.extensions.soap.SOAPBinding;	40	import javax.wsdl.extensions.soap.SOAPBinding;
41	import javax.wsdl.extensions.soap.SOAPBody;	41	import javax.wsdl.extensions.soap.SOAPBody;
42	import javax.wsdl.extensions.soap.SOAPFault;	42	import javax.wsdl.extensions.soap.SOAPFault;
Lines 1665-1678 Link Here
1665	extElement = (ExtensibilityElement) iterator.next();	1665	extElement = (ExtensibilityElement) iterator.next();
1666	// If this is an unknown ext. element, then see if it is a schema element	1666	// If this is an unknown ext. element, then see if it is a schema element
1667	TargetNamespaceProcessor tnsProcessor = null;	1667	TargetNamespaceProcessor tnsProcessor = null;
1668	if (extElement instanceof UnknownExtensibilityElement)	1668	if (extElement instanceof Schema)
1669	{	1669	{
1670	tnsProcessor = new TargetNamespaceProcessor(definition.getDocumentBaseURI());	1670	tnsProcessor = new TargetNamespaceProcessor(definition.getDocumentBaseURI());
1671		1671
1672		1672
1673	if ((nextList =	1673	if ((nextList =
1674	tnsProcessor.processAllSchema(	1674	tnsProcessor.processAllSchema(
1675	((UnknownExtensibilityElement) extElement).getElement()))	1675	((Schema) extElement).getElement()))
1676	!= null)	1676	!= null)
1677	if (list == null)	1677	if (list == null)
1678	list = new Vector();	1678	list = new Vector();

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java (-4 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002-2005 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 37-43 Link Here
37	import javax.wsdl.Service;	37	import javax.wsdl.Service;
38	import javax.wsdl.Types;	38	import javax.wsdl.Types;
39	import javax.wsdl.extensions.ExtensibilityElement;	39	import javax.wsdl.extensions.ExtensibilityElement;
40	import javax.wsdl.extensions.UnknownExtensibilityElement;	40	import javax.wsdl.extensions.schema.Schema;
41	import javax.wsdl.extensions.soap.SOAPBinding;	41	import javax.wsdl.extensions.soap.SOAPBinding;
42	import javax.wsdl.extensions.soap.SOAPBody;	42	import javax.wsdl.extensions.soap.SOAPBody;
43	import javax.wsdl.extensions.soap.SOAPFault;	43	import javax.wsdl.extensions.soap.SOAPFault;
Lines 398-406 Link Here
398	while (it.hasNext())	398	while (it.hasNext())
399	{	399	{
400	ExtensibilityElement el = (ExtensibilityElement) it.next();	400	ExtensibilityElement el = (ExtensibilityElement) it.next();
401	if (el instanceof UnknownExtensibilityElement)	401	if (el instanceof Schema)
402	searchForSchema(	402	searchForSchema(
403	((UnknownExtensibilityElement) el).getElement(),	403	((Schema) el).getElement(),
404	context);	404	context);
405	}	405	}
406	}	406	}