Attachment 119684 Details for Bug 252258 – org.eclipse.wst.wsi.txt

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

[patch] org.eclipse.wst.wsi.txt

org.eclipse.wst.wsi.txt (text/plain), 32.16 KB, created by Amy Wu

on 2008-12-05 18:55:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Amy Wu

Created: 2008-12-05 18:55:44 EST

Size: 32.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.wsi
>Index: src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java,v
>retrieving revision 1.1
>diff -u -r1.1 WSDLReaderImpl.java
>--- src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java	1 Nov 2005 17:48:20 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java	5 Dec 2008 23:52:42 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -47,6 +47,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;
>@@ -234,7 +235,7 @@
>             else
>             {
>               QName qname = QNameUtils.newQName(element2);
>-              if (Constants.XSD_QNAME_LIST.contains(qname))
>+              if (SchemaConstants.XSD_QNAME_LIST.contains(qname))
>               {
>                 WSDLFactory wsdlfactory =
>                   factoryImplName == null
>@@ -445,7 +446,8 @@
>           partEl,
>           Constants.ATTR_ELEMENT,
>           Constants.ELEM_MESSAGE,
>-          false);
>+          false,
>+          def);
>     }
> 
>     catch (WSDLException we)
>@@ -463,7 +465,8 @@
>         partEl,
>         Constants.ATTR_TYPE,
>         Constants.ELEM_MESSAGE,
>-        false);
>+        false,
>+        def);
> 
>     if (name != null)
>     {
>@@ -496,9 +499,9 @@
>       tempEl = DOMUtils.getNextSiblingElement(tempEl);
>     }
> 
>-    Map extensionAttributes = part.getExtensionAttributes();
>-
>-    extensionAttributes.putAll(getPartAttributes(partEl, def));
>+    parseExtensibilityAttributes(partEl, Part.class, part, def);
>+//    Map extensionAttributes = part.getExtensionAttributes();
>+//    extensionAttributes.putAll(getPartAttributes(partEl, def));
> 
>     // Need to do something here to locate part definition.
> 
>@@ -797,5 +800,14 @@
> 
>     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;
>+ }
> }
>Index: src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java,v
>retrieving revision 1.1
>diff -u -r1.1 InlineSchemaValidator.java
>--- src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java	1 Nov 2005 17:47:58 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java	5 Dec 2008 23:52:42 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -19,13 +19,14 @@
> 
> import javax.wsdl.Definition;
> import javax.wsdl.Types;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+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.
>@@ -40,7 +41,7 @@
>   public Map validate(Object element, List parents, String filename) throws Exception
>   {
>   	elements = new Vector();
>-    UnknownExtensibilityElement elem = (UnknownExtensibilityElement) element;
>+  	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
>@@ -63,7 +64,7 @@
> 
>     // 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))
>     {
>       throw new Exception("An old version of the schema namespace is specified.");
>     }
>@@ -132,7 +133,7 @@
>       Iterator iSchemas = schemas.iterator();
>       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))
>         {
>Index: src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java,v
>retrieving revision 1.1
>diff -u -r1.1 InlineSchemaGenerator.java
>--- src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java	1 Nov 2005 17:47:58 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java	5 Dec 2008 23:52:42 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -21,7 +21,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
>@@ -42,7 +42,7 @@
>   protected final String TYPE = "type";
>   protected final String NAME = "name";
>   protected 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;
> 
>@@ -194,9 +194,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("\"");
>       }
>@@ -213,9 +213,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: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF,v
>retrieving revision 1.32
>diff -u -r1.32 MANIFEST.MF
>--- META-INF/MANIFEST.MF	1 Apr 2008 22:22:23 -0000	1.32
>+++ META-INF/MANIFEST.MF	5 Dec 2008 23:52:41 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %_PLUGIN_NAME
> Bundle-SymbolicName: org.eclipse.wst.wsi; singleton:=true
>-Bundle-Version: 1.0.205.qualifier
>+Bundle-Version: 1.0.305.qualifier
> Bundle-Activator: org.eclipse.wst.wsi.internal.WSITestToolsPlugin
> Bundle-Vendor: %_PROVIDER_NAME
> Bundle-Localization: plugin
>@@ -49,7 +49,7 @@
>  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.ws;bundle-version="[1.0.100,2.0.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+  javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
>  org.apache.axis;bundle-version="[1.3.0,2.0.0)",
>  com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 WSDLValidatorImpl.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java	10 Sep 2006 17:53:56 -0000	1.5
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java	5 Dec 2008 23:52:42 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -36,7 +36,7 @@
> import javax.wsdl.Service;
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> import javax.wsdl.extensions.soap.SOAPBinding;
> import javax.wsdl.extensions.soap.SOAPBody;
> import javax.wsdl.extensions.soap.SOAPFault;
>@@ -1665,14 +1665,14 @@
>         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 UnknownExtensibilityElement)
>+        if (extElement instanceof Schema)
>         {
>           tnsProcessor = new TargetNamespaceProcessor(definition.getDocumentBaseURI());
> 
> 
>           if ((nextList =
>             tnsProcessor.processAllSchema(
>-              ((UnknownExtensibilityElement) extElement).getElement()))
>+              ((Schema) extElement).getElement()))
>             != null)
>             if (list == null)
>               list = new Vector();
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java,v
>retrieving revision 1.1
>diff -u -r1.1 BP4202.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java	1 Nov 2005 17:47:52 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -10,9 +10,10 @@
>  *******************************************************************************/
> 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.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.WSITag;
>@@ -57,9 +58,9 @@
>     */
>    public void visit(ExtensibilityElement obj, Object parent, WSDLTraversalContext ctx)
>    {
>-     if((obj != null) && (obj instanceof UnknownExtensibilityElement))
>+     if((obj != null) && (obj instanceof Schema))
>      {
>-       UnknownExtensibilityElement el = (UnknownExtensibilityElement) obj;
>+    	 Schema el = (Schema) obj;
>        try {
>          processor.processAllSchema(el.getElement());
>        } catch (WSIException e) {}
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java,v
>retrieving revision 1.1
>diff -u -r1.1 BP2034.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java	1 Nov 2005 17:47:53 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -14,7 +14,7 @@
> 
> import javax.wsdl.Definition;
> import javax.wsdl.Types;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIConstants;
> import org.eclipse.wst.wsi.internal.core.WSIException;
>@@ -70,8 +70,8 @@
>       for (int i = 0; i < extElems.size(); i++)
>       {
>         // Getting wsdl:schema element
>-        UnknownExtensibilityElement schema =
>-          (UnknownExtensibilityElement) extElems.get(i);
>+        Schema schema =
>+          (Schema) extElems.get(i);
>         // Getting a value of the attribute xmlns:xml
>         String attrValue = schema.getElement().getAttributeNS(
>           WSIConstants.NS_URI_XMLNS, "xml");
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java,v
>retrieving revision 1.1
>diff -u -r1.1 BP2122.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java	1 Nov 2005 17:47:52 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -14,7 +14,7 @@
> 
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.WSITag;
>@@ -67,7 +67,7 @@
>       {
>         // If it is an unknown ext. element and it is a schema, then check it
>         if ((extElement = (ExtensibilityElement) extElements.get(i))
>-          instanceof UnknownExtensibilityElement)
>+          instanceof Schema)
>         {
>           if (!extElement.getElementType().equals(WSITag.ELEM_XSD_SCHEMA))
>           {
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java,v
>retrieving revision 1.3
>diff -u -r1.3 BP2011.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java	10 Sep 2006 17:53:56 -0000	1.3
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -23,7 +23,7 @@
> import javax.wsdl.Definition;
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.WSITag;
>@@ -102,8 +102,8 @@
>       while (it.hasNext())
>       {
>         ExtensibilityElement el = (ExtensibilityElement) it.next();
>-        if (el instanceof UnknownExtensibilityElement)
>-          searchForSchema(((UnknownExtensibilityElement) el).getElement(),
>+        if (el instanceof Schema)
>+          searchForSchema(((Schema) el).getElement(),
>               definition.getDocumentBaseURI(), new ArrayList());
>       }
>     }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java,v
>retrieving revision 1.3
>diff -u -r1.3 BP2202.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java	10 Sep 2006 17:53:56 -0000	1.3
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -23,7 +23,7 @@
> import javax.wsdl.Definition;
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.WSITag;
>@@ -100,9 +100,9 @@
>       while (it.hasNext())
>       {
>         ExtensibilityElement el = (ExtensibilityElement) it.next();
>-        if (el instanceof UnknownExtensibilityElement
>+        if (el instanceof Schema
>           && el.getElementType().equals(ELEM_XSD_SCHEMA))
>-          searchForSchema(((UnknownExtensibilityElement) el).getElement(),
>+          searchForSchema(((Schema) el).getElement(),
>               definition.getDocumentBaseURI(), new ArrayList());
>       }
>     }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java,v
>retrieving revision 1.1
>diff -u -r1.1 BP2103.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java	1 Nov 2005 17:47:51 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -12,7 +12,7 @@
> 
> import javax.wsdl.Definition;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> import javax.xml.namespace.QName;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
>@@ -60,8 +60,8 @@
>     Object parent,
>     WSDLTraversalContext ctx)
>   {
>-    if (el instanceof UnknownExtensibilityElement)
>-      searchForImport(((UnknownExtensibilityElement) el).getElement());
>+    if (el instanceof Schema)
>+      searchForImport(((Schema) el).getElement());
>   }
> 
>   /* Validates the test assertion.
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java,v
>retrieving revision 1.1
>diff -u -r1.1 BP2107.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java	1 Nov 2005 17:47:52 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -15,7 +15,7 @@
> 
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.WSITag;
>@@ -72,8 +72,8 @@
>       while (it.hasNext())
>       {
>         ExtensibilityElement el = (ExtensibilityElement) it.next();
>-        if (el instanceof UnknownExtensibilityElement)
>-          searchForSchema(((UnknownExtensibilityElement) el).getElement());
>+        if (el instanceof Schema)
>+          searchForSchema(((Schema) el).getElement());
>       }
>     }
> 
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java,v
>retrieving revision 1.2
>diff -u -r1.2 BP2102.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java	10 Sep 2006 17:53:56 -0000	1.2
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -18,7 +18,7 @@
> import javax.wsdl.Definition;
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> 
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.WSITag;
>@@ -82,9 +82,9 @@
>         while (it.hasNext())
>         {
>           ExtensibilityElement el = (ExtensibilityElement) it.next();
>-          if (el instanceof UnknownExtensibilityElement
>+          if (el instanceof Schema
>             && el.getElementType().equals(ELEM_XSD_SCHEMA))
>-            testNode(((UnknownExtensibilityElement) el).getElement(),
>+            testNode(((Schema) el).getElement(),
>               definition.getDocumentBaseURI(), new ArrayList());
> 
>           if (result.equals(AssertionResult.RESULT_FAILED))
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java,v
>retrieving revision 1.3
>diff -u -r1.3 BaseMessageValidator.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java	8 Sep 2006 21:17:16 -0000	1.3
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
>+ * 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
>@@ -17,7 +17,6 @@
> 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;
>@@ -77,6 +76,7 @@
> 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;
>@@ -1651,7 +1651,7 @@
>                 {
>                   if (attr != null)
>                     xsiType =
>-                      DOMUtils.getQName(attr.getNodeValue(), (Element) m);
>+                      DOMUtils.getQName(attr.getNodeValue(), (Element) m, wsdlDocument.getDefinitions());
>                 }
>                 catch (javax.wsdl.WSDLException we)
>                 {
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java,v
>retrieving revision 1.1
>diff -u -r1.1 BP1204.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java	1 Nov 2005 17:48:01 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -20,7 +20,7 @@
> import javax.wsdl.Part;
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> import javax.xml.namespace.QName;
> 
> import org.eclipse.wst.wsi.internal.core.WSIConstants;
>@@ -274,7 +274,7 @@
>               .equals(new QName(WSIConstants.NS_URI_XSD, "schema")))
>             {
>               typesElement =
>-                ((UnknownExtensibilityElement) extElem).getElement();
>+                ((Schema) extElem).getElement();
>               break;
>             }
>           }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ProfileAssertionsReaderImpl.java
>--- src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java	8 Sep 2006 21:17:17 -0000	1.5
>+++ src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java	5 Dec 2008 23:52:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -576,7 +576,8 @@
> 		         id.equals("BP2123") ||
> 		         id.equals("SSBP2209") ||
> 		         id.equals("AP2209") ||
>-		         id.equals("BP2700")	         
>+		         id.equals("BP2700") ||
>+		         id.equals("BP2011")
> 		         );
> 	 }
> 	 return result;
>Index: src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java,v
>retrieving revision 1.2
>diff -u -r1.2 TypesRegistry.java
>--- src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java	10 Sep 2006 17:53:56 -0000	1.2
>+++ src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java	5 Dec 2008 23:52:42 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002-2005 IBM Corporation and others.
>+ * 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
>@@ -37,7 +37,7 @@
> import javax.wsdl.Service;
> import javax.wsdl.Types;
> import javax.wsdl.extensions.ExtensibilityElement;
>-import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> import javax.wsdl.extensions.soap.SOAPBinding;
> import javax.wsdl.extensions.soap.SOAPBody;
> import javax.wsdl.extensions.soap.SOAPFault;
>@@ -398,9 +398,9 @@
>       while (it.hasNext())
>       {
>         ExtensibilityElement el = (ExtensibilityElement) it.next();
>-        if (el instanceof UnknownExtensibilityElement)
>+        if (el instanceof Schema)
>           searchForSchema(
>-            ((UnknownExtensibilityElement) el).getElement(),
>+            ((Schema) el).getElement(),
>             context);
>       }
>     }

Actions: View | Diff

Attachments on bug 252258: 119684 | 119685 | 122136