Attachment #119400 for bug #252257

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




/*******************************************************************************
 * Copyright (c) 2001, 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.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.SchemaAttributeTable;
import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;

import com.ibm.wsdl.extensions.schema.SchemaConstants;
/**
 * Validate the elements defined in a WSDL 1.1 Document.
 */

    boolean partvalid = false;
    // First take care of the situation where it's from the schema namespace.
    // The 1999, 2000 and 2001 schema namespaces are all accepted.
    if (namespace.equals(SchemaConstants.NS_URI_XSD_2001)
      || namespace.equals(SchemaConstants.NS_URI_XSD_1999)
      || namespace.equals(SchemaConstants.NS_URI_XSD_2000))
    {
      SchemaAttributeTable xsdTable = new SchemaAttributeTable();
      if (xsdTable.containsSymbol(name))




/*******************************************************************************
 * Copyright (c) 2001, 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.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;


    QName portTypeName;
    try
    {
      portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false, def);
    }
    catch (Exception e)
    {

      }
      else
      {
    	// message allows extensibility elements
        msg.addExtensibilityElement(parseExtensibilityElement(Message.class, tempEl, def));
      }

      tempEl = DOMUtils.getNextSiblingElement(tempEl);

    QName elementName;
    try
    {
      elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false, def);
    }
    catch (Exception e)
    {

    {
      typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,
        // Corrected - was ATTR_ELEMENT
  Constants.ELEM_MESSAGE, false, def);
    }
    catch (Exception e)
    {


          try
          {
            qValue = DOMUtils.getQName(strValue, el, def);
          }
          catch (WSDLException e)
          {

    Input input = null;
    Output output = null;
    List faults = new Vector();
    List extElements = new ArrayList();

    while (tempEl != null)
    {

      }
      else
      {
    	// operation allows extensibility elements
        extElements.add(parseExtensibilityElement(Operation.class, tempEl, def));
        DOMUtils.throwWSDLException(tempEl);
      }

      tempEl = DOMUtils.getNextSiblingElement(tempEl);

        }
      }
    }
    
    if (extElements.size() > 0)
    {
      Iterator extElementsIterator = extElements.iterator();
      while (extElementsIterator.hasNext())
      {
          op.addExtensibilityElement((ExtensibilityElement)extElementsIterator.next());
      }
    }

    OperationType style = null;


    QName bindingStr;
    try
    {
      bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false, def);
    }
    catch (Exception e)
    {

    QName messageName = null;
    try
    {
      messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false, def);
    }
    catch (Exception e)
    {

    QName messageName = null;
    try
    {
      messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false, def);
    }
    catch (Exception e)
    {

    QName messageName = null;
    try
    {
      messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false, def);
    }
    catch (Exception e)
    {

    {
      Element elem = ((UnknownExtensibilityElement)extElem).getElement();
      registerChildElementsRecursively(elem);
    } else if (extElem instanceof Schema)
    {
        Element elem = ((Schema)extElem).getElement();
        registerChildElementsRecursively(elem);
    }
  }


Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2001, 2005 IBM Corporation and others.	2	* Copyright (c) 2001, 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 11-17 Link Here
11		11
12	package org.eclipse.wst.wsdl.validation.internal.wsdl11;	12	package org.eclipse.wst.wsdl.validation.internal.wsdl11;
13		13
14	import java.io.Reader;	14	import java.io.InputStream;
15	import java.net.URL;	15	import java.net.URL;
16	import java.util.ArrayList;	16	import java.util.ArrayList;
17	import java.util.Hashtable;	17	import java.util.Hashtable;
Lines 346-352 Link Here
346	{	346	{
347	URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;	347	URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
348	URL url = StringUtils.getURL(contextURL, wsdlURI);	348	URL url = StringUtils.getURL(contextURL, wsdlURI);
349	Reader reader = StringUtils.getContentAsReader(url);	349	InputStream reader = StringUtils.getContentAsInputStream(url);
350	InputSource inputSource = new InputSource(reader);	350	InputSource inputSource = new InputSource(reader);
351	Document doc = getDocument(inputSource, wsdlURI);	351	Document doc = getDocument(inputSource, wsdlURI);
352	reader.close();	352	reader.close();




/*******************************************************************************
 * Copyright (c) 2001, 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 java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;

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;

        }
      }
      // Handle schema imports.
      else if (QNameUtils.matches(SchemaConstants.Q_ELEM_XSD_2001, documentElement))
      {
        createXSDImport();
      }

//      locationURI = classpathURI;
//      contextURI = null;
//    }
    InputStream reader = null;
    if (locationURI != null)
    {
        try

			{
			  try
			  {
                reader = StringUtils.getContentAsInputStream(url);
			  }
			  catch(IOException e)
			  {

Lines 24-30 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
24	org.apache.ant;bundle-version="[1.6.5,2.0.0)";resolution:=optional,	24	org.apache.ant;bundle-version="[1.6.5,2.0.0)";resolution:=optional,
25	org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",	25	org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
26	org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",	26	org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
27	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	27	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
28	org.apache.xerces;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,	28	org.apache.xerces;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
29	org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",	29	org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
30	org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"	30	org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"




/*******************************************************************************
 * Copyright (c) 2001, 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 static final String TYPE = "type";
  protected static final String NAME = "name";
  protected static 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("\"");
      }




/*******************************************************************************
 * Copyright (c) 2001, 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.apache.xerces.xs.XSModel;
import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;

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 void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
  {
  	List elements = new ArrayList();
  	Schema elem = (Schema) element;
    Definition wsdlDefinition = (Definition) parents.get(parents.size() - 1);
    String baseLocation = wsdlDefinition.getDocumentBaseURI();
    // Add in the namespaces defined in the doc already that aren't defined locally in this schema.

	
    // 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))
	 {
	  valInfo.addWarning(
	      messagegenerator.getString(_WARN_OLD_SCHEMA_NAMESPACE, QUOTE + SchemaConstants.NS_URI_XSD_2001 + QUOTE), element);
	}
	
    // now create and call the validator for the inline schema

	  Set namespaces = new TreeSet(); 
      while (iSchemas.hasNext()) 
      { 
        Schema extElem = (Schema) iSchemas.next(); 
        String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE); 
        if(thisNamespace != null) 
        { 


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

   */
  private String replaceNamespace(String message, String namespace)
   {
     String xsd2001 = SchemaConstants.NS_URI_XSD_2001;
     int start = message.indexOf(xsd2001);
     int end = start + xsd2001.length();
     if(start < 0)




/*******************************************************************************
 * Copyright (c) 2001, 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.helpers.DefaultHandler;

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

/**
 * The default implementation of IXMLValidator.

  {
    super();
    
    ignoredNamespaceList.add(SchemaConstants.NS_URI_XSD_1999);
    ignoredNamespaceList.add(SchemaConstants.NS_URI_XSD_2000);
    ignoredNamespaceList.add(SchemaConstants.NS_URI_XSD_2001);
    
    adjustLocationErrorKeySet.add("cvc-complex-type.2.4.b");
    adjustLocationErrorKeySet.add("cvc-complex-type.2.3");

	 */
	public void endElement(String uri, String localName, String qName)
			throws SAXException {
		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(SchemaConstants.NS_URI_XSD_2001)|| uri.equals(SchemaConstants.NS_URI_XSD_1999) || uri.equals(SchemaConstants.NS_URI_XSD_2000)))
		{
		  isChildOfDoc = false;
		}

	public void startElement(String uri, String localName, String qName,
			Attributes atts) throws SAXException {
		startElementLocations.push(new LocationCoordinate(locator.getLineNumber(), locator.getColumnNumber()));
		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(SchemaConstants.NS_URI_XSD_2001)|| uri.equals(SchemaConstants.NS_URI_XSD_1999) || uri.equals(SchemaConstants.NS_URI_XSD_2000)))
		{
		  isChildOfDoc = true;
		}

Return to bug 252257

Lines 1-5 Link Here

(-)src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java (-14 / +28 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2001, 2007 IBM Corporation and others.	2	* Copyright (c) 2001, 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 44-49 Link Here
44	import javax.wsdl.extensions.ExtensionDeserializer;	44	import javax.wsdl.extensions.ExtensionDeserializer;
45	import javax.wsdl.extensions.ExtensionRegistry;	45	import javax.wsdl.extensions.ExtensionRegistry;
46	import javax.wsdl.extensions.UnknownExtensibilityElement;	46	import javax.wsdl.extensions.UnknownExtensibilityElement;
		47	import javax.wsdl.extensions.schema.Schema;
47	import javax.wsdl.factory.WSDLFactory;	48	import javax.wsdl.factory.WSDLFactory;
48	import javax.xml.namespace.QName;	49	import javax.xml.namespace.QName;
49		50
Lines 513-519 Link Here
513	QName portTypeName;	514	QName portTypeName;
514	try	515	try
515	{	516	{
516	portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false);	517	portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false, def);
517	}	518	}
518	catch (Exception e)	519	catch (Exception e)
519	{	520	{
Lines 962-969 Link Here
962	}	963	}
963	else	964	else
964	{	965	{
965	// XML Validation will catch this	966	// message allows extensibility elements
966	DOMUtils.throwWSDLException(tempEl);	967	msg.addExtensibilityElement(parseExtensibilityElement(Message.class, tempEl, def));
967	}	968	}
968		969
969	tempEl = DOMUtils.getNextSiblingElement(tempEl);	970	tempEl = DOMUtils.getNextSiblingElement(tempEl);
Lines 991-997 Link Here
991	QName elementName;	992	QName elementName;
992	try	993	try
993	{	994	{
994	elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false);	995	elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false, def);
995	}	996	}
996	catch (Exception e)	997	catch (Exception e)
997	{	998	{
Lines 1004-1010 Link Here
1004	{	1005	{
1005	typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,	1006	typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,
1006	// Corrected - was ATTR_ELEMENT	1007	// Corrected - was ATTR_ELEMENT
1007	Constants.ELEM_MESSAGE, false);	1008	Constants.ELEM_MESSAGE, false, def);
1008	}	1009	}
1009	catch (Exception e)	1010	catch (Exception e)
1010	{	1011	{
Lines 1087-1093 Link Here
1087		1088
1088	try	1089	try
1089	{	1090	{
1090	qValue = DOMUtils.getQName(strValue, el);	1091	qValue = DOMUtils.getQName(strValue, el, def);
1091	}	1092	}
1092	catch (WSDLException e)	1093	catch (WSDLException e)
1093	{	1094	{
Lines 1232-1237 Link Here
1232	Input input = null;	1233	Input input = null;
1233	Output output = null;	1234	Output output = null;
1234	List faults = new Vector();	1235	List faults = new Vector();
		1236	List extElements = new ArrayList();
1235		1237
1236	while (tempEl != null)	1238	while (tempEl != null)
1237	{	1239	{
Lines 1255-1263 Link Here
1255	}	1257	}
1256	else	1258	else
1257	{	1259	{
1258	// invalid element in the operation	1260	// operation allows extensibility elements
1259	// XML check will catch this	1261	extElements.add(parseExtensibilityElement(Operation.class, tempEl, def));
1260	DOMUtils.throwWSDLException(tempEl);
1261	}	1262	}
1262		1263
1263	tempEl = DOMUtils.getNextSiblingElement(tempEl);	1264	tempEl = DOMUtils.getNextSiblingElement(tempEl);
Lines 1450-1455 Link Here
1450	}	1451	}
1451	}	1452	}
1452	}	1453	}
		1454
		1455	if (extElements.size() > 0)
		1456	{
		1457	Iterator extElementsIterator = extElements.iterator();
		1458	while (extElementsIterator.hasNext())
		1459	{
		1460	op.addExtensibilityElement((ExtensibilityElement)extElementsIterator.next());
		1461	}
		1462	}
1453		1463
1454	OperationType style = null;	1464	OperationType style = null;
1455		1465
Lines 1555-1561 Link Here
1555	QName bindingStr;	1565	QName bindingStr;
1556	try	1566	try
1557	{	1567	{
1558	bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false);	1568	bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false, def);
1559	}	1569	}
1560	catch (Exception e)	1570	catch (Exception e)
1561	{	1571	{
Lines 1676-1682 Link Here
1676	QName messageName = null;	1686	QName messageName = null;
1677	try	1687	try
1678	{	1688	{
1679	messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);	1689	messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false, def);
1680	}	1690	}
1681	catch (Exception e)	1691	catch (Exception e)
1682	{	1692	{
Lines 1741-1747 Link Here
1741	QName messageName = null;	1751	QName messageName = null;
1742	try	1752	try
1743	{	1753	{
1744	messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false);	1754	messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false, def);
1745	}	1755	}
1746	catch (Exception e)	1756	catch (Exception e)
1747	{	1757	{
Lines 1806-1812 Link Here
1806	QName messageName = null;	1816	QName messageName = null;
1807	try	1817	try
1808	{	1818	{
1809	messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);	1819	messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false, def);
1810	}	1820	}
1811	catch (Exception e)	1821	catch (Exception e)
1812	{	1822	{
Lines 1929-1934 Link Here
1929	{	1939	{
1930	Element elem = ((UnknownExtensibilityElement)extElem).getElement();	1940	Element elem = ((UnknownExtensibilityElement)extElem).getElement();
1931	registerChildElementsRecursively(elem);	1941	registerChildElementsRecursively(elem);
		1942	} else if (extElem instanceof Schema)
		1943	{
		1944	Element elem = ((Schema)extElem).getElement();
		1945	registerChildElementsRecursively(elem);
1932	}	1946	}
1933	}	1947	}
1934		1948