Attachment 119400 Details for Bug 252257 – org.eclipse.wst.wsdl.validation.txt

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

[patch] org.eclipse.wst.wsdl.validation.txt

org.eclipse.wst.wsdl.validation.txt (text/plain), 23.74 KB, created by Amy Wu

on 2008-12-03 12:05:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Amy Wu

Created: 2008-12-03 12:05:27 EST

Size: 23.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.wsdl.validation
>Index: src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java,v
>retrieving revision 1.7
>diff -u -r1.7 WSDL11BasicValidator.java
>--- src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java	2 May 2007 20:30:47 -0000	1.7
>+++ src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2007 IBM Corporation and others.
>+ * 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
>@@ -45,7 +45,7 @@
> import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.SchemaAttributeTable;
> import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;
> 
>-import com.ibm.wsdl.Constants;
>+import com.ibm.wsdl.extensions.schema.SchemaConstants;
> /**
>  * Validate the elements defined in a WSDL 1.1 Document.
>  */
>@@ -605,9 +605,9 @@
>     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(Constants.NS_URI_XSD_2001)
>-      || namespace.equals(Constants.NS_URI_XSD_1999)
>-      || namespace.equals(Constants.NS_URI_XSD_2000))
>+    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))
>Index: src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java,v
>retrieving revision 1.5
>diff -u -r1.5 WSDLDocument.java
>--- src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java	11 Apr 2007 19:55:53 -0000	1.5
>+++ src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2007 IBM Corporation and others.
>+ * 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
>@@ -44,6 +44,7 @@
> 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;
> 
>@@ -513,7 +514,7 @@
>     QName portTypeName;
>     try
>     {
>-      portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false);
>+      portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -962,8 +963,8 @@
>       }
>       else
>       {
>-        // XML Validation will catch this
>-        DOMUtils.throwWSDLException(tempEl);
>+    	// message allows extensibility elements
>+        msg.addExtensibilityElement(parseExtensibilityElement(Message.class, tempEl, def));
>       }
> 
>       tempEl = DOMUtils.getNextSiblingElement(tempEl);
>@@ -991,7 +992,7 @@
>     QName elementName;
>     try
>     {
>-      elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false);
>+      elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -1004,7 +1005,7 @@
>     {
>       typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,
>         // Corrected - was ATTR_ELEMENT
>-  Constants.ELEM_MESSAGE, false);
>+  Constants.ELEM_MESSAGE, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -1087,7 +1088,7 @@
> 
>           try
>           {
>-            qValue = DOMUtils.getQName(strValue, el);
>+            qValue = DOMUtils.getQName(strValue, el, def);
>           }
>           catch (WSDLException e)
>           {
>@@ -1232,6 +1233,7 @@
>     Input input = null;
>     Output output = null;
>     List faults = new Vector();
>+    List extElements = new ArrayList();
> 
>     while (tempEl != null)
>     {
>@@ -1255,9 +1257,8 @@
>       }
>       else
>       {
>-        // invalid element in the operation
>-        // XML check will catch this
>-        DOMUtils.throwWSDLException(tempEl);
>+    	// operation allows extensibility elements
>+        extElements.add(parseExtensibilityElement(Operation.class, tempEl, def));
>       }
> 
>       tempEl = DOMUtils.getNextSiblingElement(tempEl);
>@@ -1450,6 +1451,15 @@
>         }
>       }
>     }
>+    
>+    if (extElements.size() > 0)
>+    {
>+      Iterator extElementsIterator = extElements.iterator();
>+      while (extElementsIterator.hasNext())
>+      {
>+          op.addExtensibilityElement((ExtensibilityElement)extElementsIterator.next());
>+      }
>+    }
> 
>     OperationType style = null;
> 
>@@ -1555,7 +1565,7 @@
>     QName bindingStr;
>     try
>     {
>-      bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false);
>+      bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -1676,7 +1686,7 @@
>     QName messageName = null;
>     try
>     {
>-      messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
>+      messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -1741,7 +1751,7 @@
>     QName messageName = null;
>     try
>     {
>-      messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false);
>+      messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -1806,7 +1816,7 @@
>     QName messageName = null;
>     try
>     {
>-      messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
>+      messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false, def);
>     }
>     catch (Exception e)
>     {
>@@ -1929,6 +1939,10 @@
>     {
>       Element elem = ((UnknownExtensibilityElement)extElem).getElement();
>       registerChildElementsRecursively(elem);
>+    } else if (extElem instanceof Schema)
>+    {
>+        Element elem = ((Schema)extElem).getElement();
>+        registerChildElementsRecursively(elem);
>     }
>   }
> 
>Index: src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 WSDLReaderImpl.java
>--- src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java	2 May 2007 20:30:47 -0000	1.2
>+++ src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2005 IBM Corporation and others.
>+ * 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
>@@ -11,7 +11,7 @@
> 
> package org.eclipse.wst.wsdl.validation.internal.wsdl11;
> 
>-import java.io.Reader;
>+import java.io.InputStream;
> import java.net.URL;
> import java.util.ArrayList;
> import java.util.Hashtable;
>@@ -346,7 +346,7 @@
>     {
>       URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
>       URL url = StringUtils.getURL(contextURL, wsdlURI);
>-      Reader reader = StringUtils.getContentAsReader(url);
>+      InputStream reader = StringUtils.getContentAsInputStream(url);
>       InputSource inputSource = new InputSource(reader);
>       Document doc = getDocument(inputSource, wsdlURI);
>       reader.close();
>Index: src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java,v
>retrieving revision 1.4
>diff -u -r1.4 ImportHolder.java
>--- src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java	2 May 2007 20:30:47 -0000	1.4
>+++ src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2006 IBM Corporation and others.
>+ * 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
>@@ -13,7 +13,7 @@
> 
> import java.io.File;
> import java.io.IOException;
>-import java.io.Reader;
>+import java.io.InputStream;
> import java.net.URL;
> import java.util.ArrayList;
> import java.util.Iterator;
>@@ -39,6 +39,7 @@
> 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;
>@@ -143,7 +144,7 @@
>         }
>       }
>       // Handle schema imports.
>-      else if (QNameUtils.matches(Constants.Q_ELEM_XSD_2001, documentElement))
>+      else if (QNameUtils.matches(SchemaConstants.Q_ELEM_XSD_2001, documentElement))
>       {
>         createXSDImport();
>       }
>@@ -273,7 +274,7 @@
> //      locationURI = classpathURI;
> //      contextURI = null;
> //    }
>-    Reader reader = null;
>+    InputStream reader = null;
>     if (locationURI != null)
>     {
>         try
>@@ -321,7 +322,7 @@
> 			{
> 			  try
> 			  {
>-                reader = StringUtils.getContentAsReader(url);
>+                reader = StringUtils.getContentAsInputStream(url);
> 			  }
> 			  catch(IOException e)
> 			  {
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF,v
>retrieving revision 1.30
>diff -u -r1.30 MANIFEST.MF
>--- META-INF/MANIFEST.MF	24 Jul 2008 02:17:25 -0000	1.30
>+++ META-INF/MANIFEST.MF	3 Dec 2008 17:00:32 -0000
>@@ -24,7 +24,7 @@
>  org.apache.ant;bundle-version="[1.6.5,2.0.0)";resolution:=optional,
>  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.apache.xerces;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
>  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
>Index: src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java,v
>retrieving revision 1.4
>diff -u -r1.4 InlineSchemaGenerator.java
>--- src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java	2 May 2007 20:34:37 -0000	1.4
>+++ src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2006 IBM Corporation and others.
>+ * 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
>@@ -25,7 +25,7 @@
> import org.w3c.dom.Node;
> import org.w3c.dom.NodeList;
> 
>-import com.ibm.wsdl.Constants;
>+import com.ibm.wsdl.extensions.schema.SchemaConstants;
> 
> /**
>  * Generate a String representation of a schema for an inline schema. Will add imports for unresolved
>@@ -54,7 +54,7 @@
>   protected static final String TYPE = "type";
>   protected static final String NAME = "name";
>   protected static final String[] ignoreNamespaces =
>-    { Constants.NS_URI_XSD_1999, Constants.NS_URI_XSD_2000, Constants.NS_URI_XSD_2001 };
>+    { SchemaConstants.NS_URI_XSD_1999, SchemaConstants.NS_URI_XSD_2000, SchemaConstants.NS_URI_XSD_2001 };
> 
>   protected static InlineSchemaGenerator instance = null;
> 
>@@ -252,9 +252,9 @@
>           }
>         }
>         // Replace old schema namespaces with the new schema namespace.
>-        if(nodeValue.equals(Constants.NS_URI_XSD_1999) || nodeValue.equals(Constants.NS_URI_XSD_2000))
>+        if(nodeValue.equals(SchemaConstants.NS_URI_XSD_1999) || nodeValue.equals(SchemaConstants.NS_URI_XSD_2000))
>          {
>-          nodeValue = Constants.NS_URI_XSD_2001;
>+          nodeValue = SchemaConstants.NS_URI_XSD_2001;
>         }
>         xsdString.append(nodeValue).append("\"");
>       }
>@@ -271,9 +271,9 @@
>       {
>         String key = (String)keys.nextElement();
>         String declNS = (String)reqNSDecl.get(key);
>-        if(declNS.equals(Constants.NS_URI_XSD_1999) || declNS.equals(Constants.NS_URI_XSD_2000))
>+        if(declNS.equals(SchemaConstants.NS_URI_XSD_1999) || declNS.equals(SchemaConstants.NS_URI_XSD_2000))
>          {
>-          declNS = Constants.NS_URI_XSD_2001;
>+          declNS = SchemaConstants.NS_URI_XSD_2001;
>         }
>         xsdString.append(" ").append(key).append("=\"").append(declNS).append("\"");
>       }
>Index: src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java,v
>retrieving revision 1.5
>diff -u -r1.5 InlineSchemaValidator.java
>--- src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java	2 May 2006 17:38:23 -0000	1.5
>+++ src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2006 IBM Corporation and others.
>+ * 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
>@@ -21,7 +21,7 @@
> 
> import javax.wsdl.Definition;
> import javax.wsdl.Types;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.apache.xerces.xs.XSModel;
> import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
>@@ -33,6 +33,7 @@
> 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.
>@@ -67,7 +68,7 @@
>   public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
>   {
>   	List elements = new ArrayList();
>-    UnknownExtensibilityElement elem = (UnknownExtensibilityElement) element;
>+  	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.
>@@ -89,10 +90,10 @@
> 	
>     // If the namespace given is one of the old schema namespaces produce a warning.
> 	String namespace = w3celement.getNamespaceURI();
>-	if(namespace.equals(Constants.NS_URI_XSD_1999) || namespace.equals(Constants.NS_URI_XSD_2000))
>+	if(namespace.equals(SchemaConstants.NS_URI_XSD_1999) || namespace.equals(SchemaConstants.NS_URI_XSD_2000))
> 	 {
> 	  valInfo.addWarning(
>-	      messagegenerator.getString(_WARN_OLD_SCHEMA_NAMESPACE, QUOTE + Constants.NS_URI_XSD_2001 + QUOTE), element);
>+	      messagegenerator.getString(_WARN_OLD_SCHEMA_NAMESPACE, QUOTE + SchemaConstants.NS_URI_XSD_2001 + QUOTE), element);
> 	}
> 	
>     // now create and call the validator for the inline schema
>@@ -182,7 +183,7 @@
> 	  Set namespaces = new TreeSet(); 
>       while (iSchemas.hasNext()) 
>       { 
>-        UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next(); 
>+        Schema extElem = (Schema) iSchemas.next(); 
>         String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE); 
>         if(thisNamespace != null) 
>         { 
>@@ -193,7 +194,7 @@
> 
>       while (iSchemas.hasNext())
>       {
>-        UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next();
>+    	  Schema extElem = (Schema) iSchemas.next();
>         String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
>         if (thisNamespace != null && !thisNamespace.equalsIgnoreCase(targetNamespace))
>         {
>@@ -302,7 +303,7 @@
>    */
>   private String replaceNamespace(String message, String namespace)
>    {
>-     String xsd2001 = Constants.NS_URI_XSD_2001;
>+     String xsd2001 = SchemaConstants.NS_URI_XSD_2001;
>      int start = message.indexOf(xsd2001);
>      int end = start + xsd2001.length();
>      if(start < 0)
>Index: src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java,v
>retrieving revision 1.2
>diff -u -r1.2 LineNumberDOMParser.java
>--- src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java	2 May 2007 20:50:27 -0000	1.2
>+++ src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2005 IBM Corporation and others.
>+ * 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
>@@ -26,7 +26,7 @@
> import org.xml.sax.SAXNotRecognizedException;
> import org.xml.sax.SAXNotSupportedException;
> 
>-import com.ibm.wsdl.Constants;
>+import com.ibm.wsdl.extensions.schema.SchemaConstants;
> 
> /**
>  * A DOM parser that will register location information with the elements in the model.
>@@ -107,7 +107,7 @@
>     // For elements from the Schema namespace we want to preserve them
>     // the way they were entered. Revert the values to the non-normalized values.
>     String ns = arg0.uri;
>-    if(ns != null && (ns.equals(Constants.NS_URI_XSD_2001) || ns.equals(Constants.NS_URI_XSD_1999) || ns.equals(Constants.NS_URI_XSD_2000)))
>+    if(ns != null && (ns.equals(SchemaConstants.NS_URI_XSD_2001) || ns.equals(SchemaConstants.NS_URI_XSD_1999) || ns.equals(SchemaConstants.NS_URI_XSD_2000)))
>     {
>       int numatts = arg1.getLength();
>       for(int i = 0; i < numatts; i++)
>Index: src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java,v
>retrieving revision 1.11
>diff -u -r1.11 DefaultXMLValidator.java
>--- src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java	20 Apr 2006 06:20:46 -0000	1.11
>+++ src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java	3 Dec 2008 17:00:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2006 IBM Corporation and others.
>+ * 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
>@@ -47,6 +47,7 @@
> import org.xml.sax.helpers.DefaultHandler;
> 
> import com.ibm.wsdl.Constants;
>+import com.ibm.wsdl.extensions.schema.SchemaConstants;
> 
> /**
>  * The default implementation of IXMLValidator.
>@@ -81,9 +82,9 @@
>   {
>     super();
>     
>-    ignoredNamespaceList.add(Constants.NS_URI_XSD_1999);
>-    ignoredNamespaceList.add(Constants.NS_URI_XSD_2000);
>-    ignoredNamespaceList.add(Constants.NS_URI_XSD_2001);
>+    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");
>@@ -265,7 +266,7 @@
> 	 */
> 	public void endElement(String uri, String localName, String qName)
> 			throws SAXException {
>-		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
>+		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;
> 		}
>@@ -278,7 +279,7 @@
> 	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(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
>+		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;
> 		}

Actions: View | Diff

Attachments on bug 252257: 119400 | 119401