[566183] Update wst.wsi namespace dependency

Change-Id: I2c84ad1024b10ff9f431b39dde93312128828522
diff --git a/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java b/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
index 8da5129..3879074 100644
--- a/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
+++ b/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -50,7 +50,6 @@
 import javax.wsdl.factory.WSDLFactory;
 import javax.xml.namespace.QName;
 
-import org.apache.xerces.dom.ElementImpl;
 import org.apache.xerces.dom.ElementNSImpl;
 import org.apache.xerces.xs.XSModel;
 import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
@@ -1888,8 +1887,7 @@
   {
     try
     {
-      ElementImpl elementImpl = (ElementImpl)element;
-      ElementLocation elementLocation = (ElementLocation)elementImpl.getUserData();
+      ElementLocation elementLocation = (ElementLocation)element.getUserData(ElementLocation.ID);
       if (elementLocation != null)
       {
 
diff --git a/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java b/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
index eb83df2..a730e59 100644
--- a/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
+++ b/core/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@
 
 package org.eclipse.wst.wsdl.validation.internal.xml;
 
-import org.apache.xerces.dom.ElementImpl;
 import org.apache.xerces.parsers.DOMParser;
 import org.apache.xerces.util.SymbolTable;
 import org.apache.xerces.xni.Augmentations;
@@ -122,11 +121,7 @@
     try
     {
       element = (Element)getProperty(CURRENT_ELEMENT_NODE);
-      ElementImpl elementImpl = (ElementImpl)element;
-      // Setting the user data with an identifier such as ElementLocation.KEY_NAME
-      // may be a long term good idea. The setUserData method with no id is used 
-      // to support JVMs with alternate versions of Xerces.
-      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
+      element.setUserData(ElementLocation.ID, new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()), null);
     }
     // catch SAXNotRecognizedException and SAXNotSupportedException if can't get element
     catch (ClassCastException e)
diff --git a/core/bundles/org.eclipse.wst.wsi/.classpath b/core/bundles/org.eclipse.wst.wsi/.classpath
index cab8d5e..a8baf30 100644
--- a/core/bundles/org.eclipse.wst.wsi/.classpath
+++ b/core/bundles/org.eclipse.wst.wsi/.classpath
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/apache/xerces/**"/>
-			<accessrule kind="accessible" pattern="org/apache/xml/**"/>
-			<accessrule kind="accessible" pattern="sun/misc/BASE64Decoder"/>
-			<accessrule kind="accessible" pattern="sun/misc/BASE64Encoder"/>
-			<accessrule kind="accessible" pattern="sun/misc/CharacterEncoder"/>
-			<accessrule kind="accessible" pattern="sun/misc/CharacterDecoder"/>
-			<accessrule kind="accessible" pattern="sun/net/www/MessageHeader"/>
-			<accessrule kind="accessible" pattern="javax/xml/namespace/QName"/>
-		</accessrules>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/wst/ws/internal/plugin/WSPlugin"/>
diff --git a/core/bundles/org.eclipse.wst.wsi/.cvsignore b/core/bundles/org.eclipse.wst.wsi/.cvsignore
deleted file mode 100644
index f5b199f..0000000
--- a/core/bundles/org.eclipse.wst.wsi/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-wsi.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/core/bundles/org.eclipse.wst.wsi/.settings/org.eclipse.jdt.core.prefs b/core/bundles/org.eclipse.wst.wsi/.settings/org.eclipse.jdt.core.prefs
index f2525a8..057be7e 100644
--- a/core/bundles/org.eclipse.wst.wsi/.settings/org.eclipse.jdt.core.prefs
+++ b/core/bundles/org.eclipse.wst.wsi/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -10,5 +10,5 @@
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/core/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
index c6b09e9..bfaf821 100644
--- a/core/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
@@ -2,7 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %_PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.wst.wsi; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Automatic-Module-Name: org.eclipse.wst.wsi
+Bundle-Version: 1.1.300.qualifier
 Bundle-Activator: org.eclipse.wst.wsi.internal.WSITestToolsPlugin
 Bundle-Vendor: %_PROVIDER_NAME
 Bundle-Localization: plugin
@@ -42,7 +43,7 @@
  org.eclipse.wst.wsi.internal.document;x-internal:=true,
  org.eclipse.wst.wsi.internal.report;x-internal:=true,
  org.eclipse.wst.wsi.internal.validate.wsdl;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)",
  org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
  org.eclipse.wst.command.env.core;bundle-version="[1.0.101,2.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,1.4.0)",
@@ -53,14 +54,17 @@
  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
  org.apache.axis;bundle-version="[1.3.0,2.0.0)",
  org.apache.commons.logging,
- org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
+ org.apache.xerces;bundle-version="[2.12.1,3.0.0)",
  org.apache.commons.codec;bundle-version="[1.2.0,2.0.0)"
 Import-Package: com.ibm.icu.util; version="3.8",
  com.ibm.icu.text; version="3.8",
+ javax.xml; version="1.3",
+ javax.xml.namespace; version="1.3",
+ org.w3c.dom,
  org.apache.http,
  org.apache.http.config,
  org.apache.http.impl.conn,
  org.apache.http.impl.io,
  org.apache.http.io
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/bundles/org.eclipse.wst.wsi/pom.xml b/core/bundles/org.eclipse.wst.wsi/pom.xml
index 25ef875..d296419 100644
--- a/core/bundles/org.eclipse.wst.wsi/pom.xml
+++ b/core/bundles/org.eclipse.wst.wsi/pom.xml
@@ -22,7 +22,7 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.wst.wsi</artifactId>

-  <version>1.2.0-SNAPSHOT</version>

+  <version>1.1.300-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 

   <build>

diff --git a/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java b/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
index 471bf12..eabe883 100644
--- a/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
+++ b/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2021 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -685,12 +685,9 @@
 
     try
     {
-      // See if the element object is an instanceof org.apache.xerces.dom.ElementImpl
-      ElementImpl elementImpl = (ElementImpl) element;
-
       // If it is, then get the element location information
       elementLocation =
-        (ElementLocation) elementImpl.getUserData();
+        (ElementLocation) element.getUserData(ElementLocation.KEY_NAME);
 
       // Add it to the list
       this.wsdlElementList.addElement(wsdlElement, elementLocation);
diff --git a/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java b/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
index e500754..e6fa99e 100644
--- a/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
+++ b/core/bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
+ * Copyright (c) 2002-2021 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -60,7 +60,6 @@
     throws XNIException
   {
     Element element;
-    ElementImpl elementImpl;
 
     // DEBUG:
     //System.err.println("1-line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
@@ -74,11 +73,10 @@
     {
       element = (Element) getProperty(CURRENT_ELEMENT_NODE);
 
-      elementImpl = (ElementImpl) element;
       // Setting the user data with an identifier such as ElementLocation.KEY_NAME
       // may be a long term good idea. The setUserData method with no id is used 
       // to support JVMs with alternate versions of Xerces.
-      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
+      element.setUserData(ElementLocation.KEY_NAME, new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()), null);
     }
     catch (ClassCastException cce)
     {